From 33bbf97afb85731acbab54c823b53e2b4294f06a Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 10 May 2020 03:29:34 +0000
Subject: [PATCH] Prohibit parameter assignments.

---
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/AbilityPointsData.java      |   6 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  92 +++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  20 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/AbilityPointsData.java      |   6 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  92 +++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/AbilityPointsData.java      |   6 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  92 +++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  92 +++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../model/items/type/CrystalType.java         |   8 +-
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  96 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 121 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |   3 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../model/items/type/CrystalType.java         |   8 +-
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  96 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 121 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |   3 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../model/items/type/CrystalType.java         |   8 +-
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../Q00663_SeductiveWhispers.java             |  28 +--
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  96 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 121 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |   3 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../model/items/type/CrystalType.java         |   8 +-
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ai/areas/FairySettlement/Wisp.java        |   6 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../ai/bosses/Kimerian/KimerianCommon.java    |  14 +-
 .../BlackMarketeerOfMammon.java               |   5 +-
 .../CastleCourtMagician.java                  |   3 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../HermuncusMinion/HermuncusMinion.java      |   6 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../scripts/instances/Nursery/Nursery.java    |   8 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  96 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 121 ++++++------
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |   3 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../model/items/type/CrystalType.java         |   8 +-
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../l2jmobius/gameserver/AdminCommands.java   |   3 +-
 .../gameserver/model/actor/Creature.java      |  11 +-
 .../model/actor/instance/NpcInstance.java     |   3 +-
 .../model/actor/instance/PetInstance.java     |  35 ++--
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../loginserver/network/BlowfishEngine.java   |   1 +
 .../java/org/l2jmobius/util/Locator.java      |  15 +-
 .../java/org/l2jmobius/util/Util.java         |   4 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../game/data/scripts/ai/bosses/Valakas.java  |  10 +-
 .../ai/others/NewbieHelper/NewbieHelper.java  |   3 +-
 .../data/scripts/ai/others/SummonMinions.java |  42 +++--
 .../Q242_PossessorOfAPreciousSoul.java        |   4 +-
 .../Q335_TheSongOfTheHunter.java              | 175 ++++++++++--------
 .../Q384_WarehouseKeepersPastime.java         |   5 +-
 .../commons/crypt/BlowfishEngine.java         |   1 +
 .../l2jmobius/commons/crypt/LoginCrypt.java   |  20 +-
 .../commons/mmocore/SelectorThread.java       |   1 +
 .../java/org/l2jmobius/commons/util/Util.java |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   7 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   6 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |  10 +-
 .../gameserver/ai/FortSiegeGuardAI.java       |  27 +--
 .../l2jmobius/gameserver/ai/SiegeGuardAI.java |  22 +--
 .../communitybbs/Manager/ClanBBSManager.java  |   4 +-
 .../communitybbs/Manager/MailBBSManager.java  |   8 +-
 .../gameserver/datatables/SkillTable.java     |  11 +-
 .../gameserver/engines/DocumentBase.java      |  19 +-
 .../gameserver/engines/DocumentItem.java      |   3 +-
 .../gameserver/engines/DocumentSkill.java     |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../handler/AutoAnnouncementHandler.java      |  11 +-
 .../gameserver/handler/AutoChatHandler.java   |   8 +-
 .../AdminAnnouncements.java                   |   7 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEditNpc.java    |   6 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminManor.java      |   3 +-
 .../admincommandhandlers/AdminSiege.java      |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   3 +-
 .../admincommandhandlers/AdminSpawn.java      |   3 +-
 .../handler/skillhandlers/Continuous.java     |  13 +-
 .../FourSepulchersManager.java                |  11 +-
 .../instancemanager/PetitionManager.java      |   5 +-
 .../instancemanager/RaidBossSpawnManager.java |  11 +-
 .../gameserver/model/ChanceSkillList.java     |  19 +-
 .../gameserver/model/ObjectPosition.java      |  30 +--
 .../org/l2jmobius/gameserver/model/Party.java |  21 ++-
 .../org/l2jmobius/gameserver/model/Skill.java |   5 +-
 .../gameserver/model/StoreTradeList.java      |  25 +--
 .../gameserver/model/WorldObject.java         |  30 +--
 .../gameserver/model/actor/Attackable.java    |  15 +-
 .../gameserver/model/actor/Creature.java      |  48 +++--
 .../gameserver/model/actor/Summon.java        |   6 +-
 .../instance/ControllableMobInstance.java     |  10 +-
 .../model/actor/instance/GourdInstance.java   |   3 +-
 .../actor/instance/MerchantInstance.java      |   5 +-
 .../model/actor/instance/NpcInstance.java     |   6 +-
 .../model/actor/instance/PetInstance.java     |   6 +-
 .../model/actor/instance/PlayerInstance.java  |  82 ++++----
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../actor/instance/SepulcherNpcInstance.java  |   5 +-
 .../model/actor/stat/PlayableStat.java        |  26 +--
 .../model/actor/stat/PlayerStat.java          |  18 +-
 .../model/actor/status/CreatureStatus.java    |  26 +--
 .../model/actor/status/PlayerStatus.java      |   5 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  23 ++-
 .../gameserver/model/entity/Auction.java      |   7 +-
 .../model/entity/event/Lottery.java           |   4 +-
 .../entity/sevensigns/SevenSignsFestival.java |   5 +-
 .../gameserver/model/entity/siege/Castle.java |  14 +-
 .../model/itemcontainer/ItemContainer.java    |  26 +--
 .../model/itemcontainer/PlayerInventory.java  |  16 +-
 .../model/items/instance/ItemInstance.java    |  11 +-
 .../gameserver/model/multisell/Multisell.java |   3 +-
 .../gameserver/model/quest/QuestSpawn.java    |  15 +-
 .../gameserver/model/quest/QuestState.java    |  39 ++--
 .../gameserver/model/skills/BaseStat.java     |   6 +-
 .../gameserver/model/skills/Formulas.java     |  36 ++--
 .../gameserver/model/skills/Stat.java         |   6 +-
 .../gameserver/model/spawn/AutoSpawn.java     |  17 +-
 .../gameserver/model/spawn/Spawn.java         |  13 +-
 .../clientpackets/MultiSellChoose.java        |   8 +-
 .../RequestConfirmRefinerItem.java            |   8 +-
 .../network/clientpackets/RequestRefine.java  |   8 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../taskmanager/AttackStanceTaskManager.java  |   9 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   3 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |  11 +-
 .../l2jmobius/loginserver/LoginClient.java    |   3 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../Hellbound/AI/NPC/Bernarde/Bernarde.java   |  14 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../scripts/ai/others/Survivor/Survivor.java  |   2 +-
 .../RainbowSpringsChateau.java                |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   3 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSiege.java      |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../AdminTerritoryWar.java                    |   3 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/RentPet.java      |   3 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/targethandlers/AreaSummon.java   |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00384_WarehouseKeepersPastime.java       |  14 +-
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00511_AwlUnderFoot.java                  |  15 +-
 .../Q00660_AidingTheFloranVillage.java        |   3 +-
 .../Q00726_LightWithinTheDarkness.java        |  14 +-
 .../Q10272_LightFragment.java                 |  10 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../gameserver/SevenSignsFestival.java        |   5 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   6 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/FortSiegeGuardAI.java       |  21 ++-
 .../l2jmobius/gameserver/ai/SiegeGuardAI.java |  23 ++-
 .../data/xml/impl/MultisellData.java          |   3 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../datatables/AugmentationData.java          |   8 +-
 .../gameserver/engines/DocumentBase.java      |  27 ++-
 .../engines/items/DocumentItem.java           |   3 +-
 .../engines/skills/DocumentSkill.java         |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../gameserver/handler/TelnetHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   5 +-
 .../instancemanager/FortManager.java          |   5 +-
 .../FourSepulchersManager.java                |   9 +-
 .../instancemanager/games/Lottery.java        |  12 +-
 .../gameserver/model/AutoSpawnHandler.java    |  17 +-
 .../org/l2jmobius/gameserver/model/Party.java |  10 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |   9 +-
 .../gameserver/model/actor/Creature.java      |  55 ++++--
 .../l2jmobius/gameserver/model/actor/Npc.java |   3 +-
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |  19 +-
 .../model/actor/instance/PlayerInstance.java  |  73 ++++----
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../actor/instance/SepulcherNpcInstance.java  |   5 +-
 .../model/actor/stat/PlayableStat.java        |  29 +--
 .../model/actor/stat/PlayerStat.java          |  21 ++-
 .../model/actor/status/PlayerStatus.java      |  49 +++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/entity/Auction.java      |   7 +-
 .../gameserver/model/entity/Castle.java       |  24 +--
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  43 +++--
 .../model/events/EventDispatcher.java         |   5 +-
 .../model/instancezone/Instance.java          |   6 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  31 ++--
 .../model/itemcontainer/PlayerInventory.java  |  50 ++---
 .../gameserver/model/quest/QuestState.java    |  10 +-
 .../gameserver/model/stats/BaseStat.java      |   7 +-
 .../gameserver/model/stats/Formulas.java      |   6 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   8 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   9 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |  34 ++--
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../Hellbound/AI/NPC/Bernarde/Bernarde.java   |  14 +-
 .../areas/IsleOfPrayer/DarkWaterDragon.java   |   7 +-
 .../data/scripts/ai/bosses/Beleth/Beleth.java |  39 ++--
 .../scripts/ai/others/Survivor/Survivor.java  |   2 +-
 .../RainbowSpringsChateau.java                |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   3 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSiege.java      |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../AdminTerritoryWar.java                    |   3 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/RentPet.java      |   3 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/targethandlers/AreaSummon.java   |   8 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00384_WarehouseKeepersPastime.java       |  14 +-
 .../Q00386_StolenDignity.java                 |  14 +-
 .../Q00511_AwlUnderFoot.java                  |  15 +-
 .../Q00660_AidingTheFloranVillage.java        |   3 +-
 .../Q00726_LightWithinTheDarkness.java        |  14 +-
 .../Q10272_LightFragment.java                 |  10 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../gameserver/SevenSignsFestival.java        |   5 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   6 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/FortSiegeGuardAI.java       |  21 ++-
 .../l2jmobius/gameserver/ai/SiegeGuardAI.java |  23 ++-
 .../data/xml/impl/MultisellData.java          |   3 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../datatables/AugmentationData.java          |   8 +-
 .../gameserver/engines/DocumentBase.java      |  27 ++-
 .../engines/items/DocumentItem.java           |   3 +-
 .../engines/skills/DocumentSkill.java         |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../gameserver/handler/TelnetHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   5 +-
 .../instancemanager/FortManager.java          |   5 +-
 .../FourSepulchersManager.java                |   9 +-
 .../instancemanager/games/Lottery.java        |  12 +-
 .../gameserver/model/AutoSpawnHandler.java    |  17 +-
 .../org/l2jmobius/gameserver/model/Party.java |  10 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |   9 +-
 .../gameserver/model/actor/Creature.java      |  55 ++++--
 .../l2jmobius/gameserver/model/actor/Npc.java |   3 +-
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |  19 +-
 .../model/actor/instance/PlayerInstance.java  |  73 ++++----
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../actor/instance/SepulcherNpcInstance.java  |   5 +-
 .../model/actor/stat/PlayableStat.java        |  29 +--
 .../model/actor/stat/PlayerStat.java          |  21 ++-
 .../model/actor/status/PlayerStatus.java      |  49 +++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/entity/Auction.java      |   7 +-
 .../gameserver/model/entity/Castle.java       |  24 +--
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../gameserver/model/entity/NevitSystem.java  |   3 +-
 .../model/events/AbstractScript.java          |  43 +++--
 .../model/events/EventDispatcher.java         |   5 +-
 .../model/instancezone/Instance.java          |   6 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  31 ++--
 .../model/itemcontainer/PlayerInventory.java  |  50 ++---
 .../gameserver/model/quest/QuestState.java    |  10 +-
 .../gameserver/model/stats/BaseStat.java      |   7 +-
 .../gameserver/model/stats/Formulas.java      |   6 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   8 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   9 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |  34 ++--
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  95 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  95 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  99 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      | 103 +++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      | 103 +++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      | 103 +++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 .../.settings/org.eclipse.jdt.core.prefs      |  15 +-
 .../scripts/ai/bosses/DrChaos/DrChaos.java    |   9 +-
 .../ClanHallManager/ClanHallManager.java      |   3 +-
 .../ai/others/ClassMaster/ClassMaster.java    |   3 +-
 .../admincommandhandlers/AdminBuffs.java      |   3 +-
 .../admincommandhandlers/AdminEditChar.java   |   6 +-
 .../admincommandhandlers/AdminEffects.java    |   3 +-
 .../AdminFightCalculator.java                 |  12 +-
 .../admincommandhandlers/AdminFortSiege.java  |   3 +-
 .../AdminInstanceZone.java                    |   3 +-
 .../admincommandhandlers/AdminSkill.java      |   8 +-
 .../admincommandhandlers/AdminSpawn.java      |   5 +-
 .../handlers/bypasshandlers/NpcViewMod.java   |   3 +-
 .../handlers/bypasshandlers/QuestLink.java    |   7 +-
 .../handlers/chathandlers/ChatGeneral.java    |   3 +-
 .../handlers/communityboard/ClanBoard.java    |   3 +-
 .../handlers/effecthandlers/AddHate.java      |   3 +-
 .../Q00126_TheNameOfEvil2.java                |  75 ++++----
 .../Q00500_BrothersBoundInChains.java         |   6 +-
 .../DarkElfChange1/DarkElfChange1.java        |   2 +-
 .../DarkElfChange2/DarkElfChange2.java        |   2 +-
 .../l2jmobius/commons/util/CommonUtil.java    |  18 +-
 .../org/l2jmobius/commons/util/HexUtils.java  |  29 ++-
 .../commons/util/crypt/BlowfishEngine.java    |   1 +
 .../org/l2jmobius/gameserver/GameServer.java  |   4 +-
 .../org/l2jmobius/gameserver/Shutdown.java    |   6 +-
 .../l2jmobius/gameserver/ai/AbstractAI.java   |   5 +-
 .../l2jmobius/gameserver/ai/AttackableAI.java |   5 +-
 .../l2jmobius/gameserver/ai/CreatureAI.java   |   9 +-
 .../gameserver/ai/DoppelgangerAI.java         |   3 +-
 .../data/xml/impl/ExperienceData.java         |   4 +-
 .../data/xml/impl/ExtendDropData.java         |  17 +-
 .../data/xml/impl/MultisellData.java          |  12 +-
 .../xml/impl/SendMessageLocalisationData.java |   8 +-
 .../gameserver/data/xml/impl/SkillData.java   |  43 +++--
 .../data/xml/impl/SkillTreeData.java          |   7 +-
 .../gameserver/engines/DocumentBase.java      |  18 +-
 .../engines/items/DocumentItem.java           |   3 +-
 .../gameserver/geoengine/GeoEngine.java       |  21 ++-
 .../geoengine/GeoEnginePathfinding.java       |   5 +-
 .../gameserver/handler/BypassHandler.java     |   3 +-
 .../instancemanager/CastleManager.java        |   3 +-
 .../instancemanager/ClanEntryManager.java     |   9 +-
 .../instancemanager/FortManager.java          |   3 +-
 .../instancemanager/games/Lottery.java        |  12 +-
 .../org/l2jmobius/gameserver/model/Party.java |  16 +-
 .../l2jmobius/gameserver/model/Petition.java  |   2 +-
 .../gameserver/model/WorldObject.java         |  50 ++---
 .../gameserver/model/actor/Attackable.java    |  11 +-
 .../gameserver/model/actor/Creature.java      |  95 ++++++----
 .../actor/instance/FortCommanderInstance.java |   3 +-
 .../model/actor/instance/GuardInstance.java   |   4 +-
 .../model/actor/instance/PetInstance.java     |   4 +-
 .../model/actor/instance/PlayerInstance.java  | 119 ++++++------
 .../actor/instance/SchemeBufferInstance.java  |   9 +-
 .../model/actor/stat/PlayableStat.java        |  28 +--
 .../model/actor/stat/PlayerStat.java          |  23 ++-
 .../model/actor/status/PlayerStatus.java      |  41 ++--
 .../model/actor/status/SiegeFlagStatus.java   |   3 +-
 .../model/actor/status/SummonStatus.java      |   4 +-
 .../model/actor/templates/NpcTemplate.java    |   6 +-
 .../gameserver/model/base/SubClass.java       |  11 +-
 .../l2jmobius/gameserver/model/clan/Clan.java |  19 +-
 .../gameserver/model/cubic/CubicInstance.java |   3 +-
 .../gameserver/model/entity/Castle.java       |  12 +-
 .../gameserver/model/entity/Hero.java         |   4 +-
 .../model/events/AbstractScript.java          |  51 ++---
 .../model/events/EventDispatcher.java         |   5 +-
 .../gameserver/model/fishing/Fishing.java     |   3 +-
 .../model/instancezone/Instance.java          |   5 +-
 .../itemauction/AuctionDateGenerator.java     |   3 +-
 .../model/itemcontainer/ItemContainer.java    |  36 ++--
 .../model/itemcontainer/PlayerInventory.java  |  52 +++---
 .../gameserver/model/quest/QuestState.java    |   8 +-
 .../gameserver/model/skills/SkillCaster.java  |  13 +-
 .../gameserver/model/stats/Formulas.java      |   8 +-
 .../gameserver/model/stats/Stat.java          |   6 +-
 .../serverpackets/AbstractHtmlPacket.java     |   3 +-
 .../serverpackets/MagicSkillLaunched.java     |   4 +-
 .../scripting/ScriptEngineManager.java        |  11 +-
 .../scripting/java/ScriptingFileManager.java  |   9 +-
 .../security/SecondaryPasswordAuth.java       |  18 +-
 .../taskmanager/AttackStanceTaskManager.java  |  10 +-
 .../l2jmobius/gameserver/ui/SystemPanel.java  |  15 +-
 .../l2jmobius/gameserver/util/Broadcast.java  |   8 +-
 .../l2jmobius/gameserver/util/HtmlUtil.java   |   6 +-
 .../l2jmobius/gameserver/util/Locator.java    |  15 +-
 .../util/TimeAmountInterpreter.java           |   6 +-
 .../org/l2jmobius/gameserver/util/Util.java   |   9 +-
 .../gameserver/util/cron4j/CronParser.java    |  19 +-
 .../l2jmobius/loginserver/LoginServer.java    |   4 +-
 .../console/DBInstallerConsole.java           |   9 +-
 .../geodataconverter/GeoDataConverter.java    |   6 +-
 .../gsregistering/BaseGameServerRegister.java |   5 +-
 .../gsregistering/GameServerRegister.java     |   3 +-
 1756 files changed, 12542 insertions(+), 10025 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_1.0_Ertheia/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 9440bd41c5..81e8fd76e2 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -471,8 +471,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ea17f1859a..c55c79b02a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index a3efd94d61..3283dba31e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1079,8 +1079,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1181,7 +1182,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1194,6 +1195,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 7fe15ca81b..2258789af3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 0db21af800..4039682641 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8e55c9d1d6..788906307a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java
index d898cefff2..45b464e2ea 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java
@@ -489,9 +489,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index 7b2d4f027d..55d33484c7 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -83,9 +83,9 @@ public class AbilityPointsData implements IXmlReader
 		return null;
 	}
 	
-	public long getPrice(int points)
+	public long getPrice(int value)
 	{
-		points++; // for next point
+		final int points = value + 1; // for next point
 		final RangeAbilityPointsHolder holder = getHolder(points);
 		if (holder == null)
 		{
@@ -96,7 +96,7 @@ public class AbilityPointsData implements IXmlReader
 			}
 			
 			// No data found
-			return points >= 13 ? 1_000_000_000 : points >= 9 ? 750_000_000 : points >= 5 ? 500_000_000 : 250_000_000;
+			return points >= 13 ? 1000000000 : points >= 9 ? 750000000 : points >= 5 ? 500000000 : 250000000;
 		}
 		return holder.getSP();
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index e2d4dba94b..e20e75af66 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -683,12 +683,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -715,6 +716,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -762,8 +764,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 14fe491578..23d99651d4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,36 +4536,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5051,8 +5069,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5061,8 +5080,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index a06e91c104..0215597d21 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2003,13 +2003,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2691,12 +2693,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2749,12 +2746,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3426,8 +3418,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3440,7 +3432,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3454,14 +3446,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3712,8 +3704,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3722,33 +3714,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3760,7 +3752,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4626,11 +4618,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8270,32 +8263,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8308,7 +8303,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8322,7 +8317,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8335,32 +8330,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8368,7 +8363,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8384,20 +8379,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8411,9 +8406,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8427,27 +8422,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8457,7 +8452,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8469,7 +8464,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 46844ed551..72b4f75ada 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -410,18 +413,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -488,9 +492,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -531,13 +535,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 72b6866505..e43138a4dc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1163,8 +1163,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1832,10 +1833,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1912,8 +1913,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1921,18 +1921,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java
index ce46b99bf1..75163510ca 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index d2bf0841b1..955abcf77b 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2187,9 +2187,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2200,17 +2200,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2229,7 +2231,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2581,16 +2583,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2601,6 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2871,29 +2874,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2931,10 +2934,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2949,7 +2952,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2966,6 +2970,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index b9c7fbff55..f641afbab5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index c66b1bf2d7..14b647bea1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index d5e67aaaf8..0a9991688e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -110,6 +110,7 @@ public class SkillCaster implements Runnable
 		_skill = skill;
 		_item = item;
 		_castingType = castingType;
+		
 		calcSkillTiming(caster, skill);
 	}
 	
@@ -132,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -141,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -154,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -230,6 +231,7 @@ public class SkillCaster implements Runnable
 	{
 		final Creature caster = _caster.get();
 		final WorldObject target = _target.get();
+		
 		if ((caster == null) || (target == null))
 		{
 			return false;
@@ -400,6 +402,7 @@ public class SkillCaster implements Runnable
 	{
 		final Creature caster = _caster.get();
 		final WorldObject target = _target.get();
+		
 		if ((caster == null) || (target == null))
 		{
 			return false;
@@ -435,6 +438,7 @@ public class SkillCaster implements Runnable
 	{
 		final Creature caster = _caster.get();
 		final WorldObject target = _target.get();
+		
 		if ((caster == null) || (target == null))
 		{
 			return false;
@@ -519,6 +523,7 @@ public class SkillCaster implements Runnable
 		
 		// On each repeat recharge shots before cast.
 		caster.rechargeShots(_skill.useSoulShot(), _skill.useSpiritShot(), false);
+		
 		return true;
 	}
 	
@@ -603,6 +608,7 @@ public class SkillCaster implements Runnable
 						{
 							// Update pvpflag.
 							player.updatePvPStatus((Creature) obj);
+							
 							if (obj.isSummon())
 							{
 								((Summon) obj).updateAndBroadcastStatus(1);
@@ -803,19 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
+				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
index eda3d6d9fa..d0202aad76 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -325,16 +325,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index 7b4a9fb700..5ad92f7473 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -150,16 +150,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_2.5_Underground/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 9440bd41c5..81e8fd76e2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -471,8 +471,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index f3f20b02e2..8a34f4ad28 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index e14932181b..cf4d249786 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 7fe15ca81b..2258789af3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 0db21af800..4039682641 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8e55c9d1d6..788906307a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java
index a3e9fe3f61..756d26559b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java
@@ -497,9 +497,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index 7b2d4f027d..55d33484c7 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -83,9 +83,9 @@ public class AbilityPointsData implements IXmlReader
 		return null;
 	}
 	
-	public long getPrice(int points)
+	public long getPrice(int value)
 	{
-		points++; // for next point
+		final int points = value + 1; // for next point
 		final RangeAbilityPointsHolder holder = getHolder(points);
 		if (holder == null)
 		{
@@ -96,7 +96,7 @@ public class AbilityPointsData implements IXmlReader
 			}
 			
 			// No data found
-			return points >= 13 ? 1_000_000_000 : points >= 9 ? 750_000_000 : points >= 5 ? 500_000_000 : 250_000_000;
+			return points >= 13 ? 1000000000 : points >= 9 ? 750000000 : points >= 5 ? 500000000 : 250000000;
 		}
 		return holder.getSP();
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 27e7e104f7..41c71b1ac6 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 14fe491578..23d99651d4 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,36 +4536,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5051,8 +5069,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5061,8 +5080,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 5ee99b46ea..c7b7724b2e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2009,13 +2009,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2697,12 +2699,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2755,12 +2752,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3432,8 +3424,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3446,7 +3438,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3460,14 +3452,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3718,8 +3710,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3728,33 +3720,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3766,7 +3758,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4632,11 +4624,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8277,32 +8270,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8315,7 +8310,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8329,7 +8324,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8342,32 +8337,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8375,7 +8370,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8391,20 +8386,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8418,9 +8413,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8434,27 +8429,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8464,7 +8459,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8476,7 +8471,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index bc6f7ad072..9c3c1c4dab 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -98,7 +98,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -108,6 +108,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -412,18 +415,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -490,9 +494,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -533,13 +537,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
index ab297ebca6..dba53353a6 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1833,10 +1834,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1913,8 +1914,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1922,18 +1922,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java
index ce46b99bf1..75163510ca 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index d2bf0841b1..955abcf77b 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2187,9 +2187,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2200,17 +2200,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2229,7 +2231,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2581,16 +2583,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2601,6 +2603,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2871,29 +2874,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2931,10 +2934,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2949,7 +2952,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2966,6 +2970,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index b9c7fbff55..f641afbab5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index a4262b6c84..7143824dfa 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
index eda3d6d9fa..d0202aad76 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -325,16 +325,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_3.0_Helios/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 9440bd41c5..81e8fd76e2 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -471,8 +471,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 788c6b245e..48d37408da 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index e14932181b..cf4d249786 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 7ddcba2136..4c73b789c4 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 520d022573..be7eaf3c97 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java
index a3e9fe3f61..756d26559b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java
@@ -497,9 +497,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
index 7b2d4f027d..55d33484c7 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
@@ -83,9 +83,9 @@ public class AbilityPointsData implements IXmlReader
 		return null;
 	}
 	
-	public long getPrice(int points)
+	public long getPrice(int value)
 	{
-		points++; // for next point
+		final int points = value + 1; // for next point
 		final RangeAbilityPointsHolder holder = getHolder(points);
 		if (holder == null)
 		{
@@ -96,7 +96,7 @@ public class AbilityPointsData implements IXmlReader
 			}
 			
 			// No data found
-			return points >= 13 ? 1_000_000_000 : points >= 9 ? 750_000_000 : points >= 5 ? 500_000_000 : 250_000_000;
+			return points >= 13 ? 1000000000 : points >= 9 ? 750000000 : points >= 5 ? 500000000 : 250000000;
 		}
 		return holder.getSP();
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 27e7e104f7..41c71b1ac6 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 5eb6fe19c8..d1ece63ade 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,36 +4536,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5051,8 +5069,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5061,8 +5080,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index c9601936ee..d7840736c1 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2011,13 +2011,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2699,12 +2701,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2757,12 +2754,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3434,8 +3426,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3448,7 +3440,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3462,14 +3454,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3720,8 +3712,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3730,33 +3722,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3768,7 +3760,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4634,11 +4626,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8279,32 +8272,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8317,7 +8312,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8331,7 +8326,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8344,32 +8339,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8377,7 +8372,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8393,20 +8388,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8420,9 +8415,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8436,27 +8431,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8466,7 +8461,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8478,7 +8473,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index bc6f7ad072..9c3c1c4dab 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -98,7 +98,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -108,6 +108,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -412,18 +415,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -490,9 +494,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -533,13 +537,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
index ab297ebca6..dba53353a6 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1833,10 +1834,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1913,8 +1914,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1922,18 +1922,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java
index ce46b99bf1..75163510ca 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index 2776f6eb1b..6d9f2df453 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index a4262b6c84..7143824dfa 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
index eda3d6d9fa..d0202aad76 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -325,16 +325,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_4.0_GrandCrusade/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 9440bd41c5..81e8fd76e2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -471,8 +471,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 788c6b245e..48d37408da 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index e14932181b..cf4d249786 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 7ddcba2136..4c73b789c4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 520d022573..be7eaf3c97 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java
index f0ff734284..7e0c6cb553 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java
@@ -497,9 +497,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 9305ea230d..003d4fbfc2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -193,14 +193,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -274,8 +275,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -323,12 +325,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -343,9 +347,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -360,8 +365,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 27e7e104f7..41c71b1ac6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 5eb6fe19c8..d1ece63ade 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,36 +4536,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5051,8 +5069,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5061,8 +5080,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index de6ca84222..5511823480 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2031,13 +2031,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2707,12 +2709,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2753,12 +2750,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3430,8 +3422,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3444,7 +3436,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3458,14 +3450,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3716,8 +3708,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3726,33 +3718,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3764,7 +3756,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4630,11 +4622,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8274,32 +8267,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8312,7 +8307,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8326,7 +8321,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8339,32 +8334,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8372,7 +8367,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8388,20 +8383,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8415,9 +8410,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8431,27 +8426,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8461,7 +8456,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8473,7 +8468,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 643dc067fd..688922f124 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -485,9 +489,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -528,13 +532,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
index ab297ebca6..dba53353a6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1833,10 +1834,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1913,8 +1914,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1922,18 +1922,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java
index ce46b99bf1..75163510ca 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index 2776f6eb1b..6d9f2df453 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
index 8cf3fafdb5..b9c20b90ae 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
@@ -86,20 +86,17 @@ public enum CrystalType
 		return getLevel() < crystalType.getLevel();
 	}
 	
-	public CrystalType plusLevel(int level)
+	public CrystalType plusLevel(int levelValue)
 	{
-		level += _level;
-		
+		final int level = levelValue + _level;
 		if (level >= CrystalType.R99.getLevel())
 		{
 			return CrystalType.R99;
 		}
-		
 		if (level <= CrystalType.NONE.getLevel())
 		{
 			return CrystalType.NONE;
 		}
-		
 		return getByLevel(level);
 	}
 	
@@ -112,7 +109,6 @@ public enum CrystalType
 				return crystalType;
 			}
 		}
-		
 		return null;
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index a4262b6c84..7143824dfa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 3176f87706..573b17a821 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -326,16 +326,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_5.0_Salvation/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 85c6564f6b..655b32f8c8 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -469,8 +469,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 788c6b245e..48d37408da 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index ca6796a7e8..9450fa0306 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index c8651686fc..b7ede659e6 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 520d022573..be7eaf3c97 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java
index e873102b19..82f7610f37 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java
@@ -499,9 +499,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java
index edb0de5214..726102915a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 9305ea230d..003d4fbfc2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -193,14 +193,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -274,8 +275,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -323,12 +325,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -343,9 +347,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -360,8 +365,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
index 90f1476f7d..f977f75549 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Party.java
@@ -825,17 +825,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -881,10 +881,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 480145c52f..b326dc412d 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -665,12 +665,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -697,6 +698,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -744,8 +746,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 92812da903..686bc950eb 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,45 +4536,45 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5060,8 +5078,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5070,8 +5089,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 21f0680cda..1395429b55 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 43bcf594ea..8b8533006f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2024,13 +2024,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2700,12 +2702,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2746,12 +2743,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3423,8 +3415,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3437,7 +3429,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3451,14 +3443,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3695,8 +3687,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3705,33 +3697,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3743,7 +3735,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4610,11 +4602,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8253,32 +8246,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8291,7 +8286,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8305,7 +8300,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8318,32 +8313,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HR_S3_MIN_AND_S4_SEC_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MIN_S3_SEC_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SEC_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8351,11 +8346,11 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			// Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
-			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
+			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((usedSkill.getId() == 10020) || (usedSkill.getId() == 10021)))
 			{
 				sendPacket(sm);
 				return false;
@@ -8371,20 +8366,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8398,9 +8393,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8414,27 +8409,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8444,7 +8439,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8456,7 +8451,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 0ffa3be309..f30c369427 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -96,7 +96,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -106,6 +106,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 		
 		// Removed used by new Clan system.
@@ -491,9 +495,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -534,13 +538,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 371c747183..5a9a618eab 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1075,8 +1075,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
index cd0825217b..f5941e519f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index ce68e8c1d2..b4b58f0fcd 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index bb8039c66f..0183b272fd 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
index 8cf3fafdb5..b9c20b90ae 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
@@ -86,20 +86,17 @@ public enum CrystalType
 		return getLevel() < crystalType.getLevel();
 	}
 	
-	public CrystalType plusLevel(int level)
+	public CrystalType plusLevel(int levelValue)
 	{
-		level += _level;
-		
+		final int level = levelValue + _level;
 		if (level >= CrystalType.R99.getLevel())
 		{
 			return CrystalType.R99;
 		}
-		
 		if (level <= CrystalType.NONE.getLevel())
 		{
 			return CrystalType.NONE;
 		}
-		
 		return getByLevel(level);
 	}
 	
@@ -112,7 +109,6 @@ public enum CrystalType
 				return crystalType;
 			}
 		}
-		
 		return null;
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 0d4f9a86ae..e8e41c297d 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 28888b5a57..f83ae3eed1 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -331,16 +331,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_5.5_EtinasFate/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 38ae22a98d..5ccab2e8c6 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 85c6564f6b..655b32f8c8 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -469,8 +469,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 788c6b245e..48d37408da 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index ca6796a7e8..9450fa0306 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index b872456e17..2872dc8d60 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 82a3bdf30c..726aa7e4a2 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 520d022573..be7eaf3c97 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -310,30 +310,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java
index e873102b19..82f7610f37 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java
@@ -499,9 +499,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index a4de5a1083..7473fedc47 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 9305ea230d..003d4fbfc2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -193,14 +193,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -274,8 +275,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -323,12 +325,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -343,9 +347,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -360,8 +365,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
index 90f1476f7d..f977f75549 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Party.java
@@ -825,17 +825,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -881,10 +881,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 480145c52f..b326dc412d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -665,12 +665,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -697,6 +698,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -744,8 +746,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 92812da903..686bc950eb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,45 +4536,45 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5060,8 +5078,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5070,8 +5089,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1915f9adeb..db46359fbf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2024,13 +2024,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2700,12 +2702,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2746,12 +2743,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3423,8 +3415,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3437,7 +3429,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3451,14 +3443,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3695,8 +3687,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3705,33 +3697,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3743,7 +3735,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4610,11 +4602,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8253,32 +8246,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8291,7 +8286,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8305,7 +8300,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8318,32 +8313,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8351,11 +8346,11 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			// Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
-			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
+			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((usedSkill.getId() == 10020) || (usedSkill.getId() == 10021)))
 			{
 				sendPacket(sm);
 				return false;
@@ -8371,20 +8366,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8398,9 +8393,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8414,27 +8409,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8444,7 +8439,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8456,7 +8451,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index c5ed8ee0a3..cdfad62e04 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -96,7 +96,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -106,6 +106,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 		
 		// Removed used by new Clan system.
@@ -491,9 +495,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -534,13 +538,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 6a054c8a2a..8f61edab69 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_HAS_REACHED_0_THE_MANA_ARMOR_HAS_DISAPPEARED);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 371c747183..5a9a618eab 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1075,8 +1075,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
index cd0825217b..f5941e519f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index ce68e8c1d2..b4b58f0fcd 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
index 8cf3fafdb5..b9c20b90ae 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
@@ -86,20 +86,17 @@ public enum CrystalType
 		return getLevel() < crystalType.getLevel();
 	}
 	
-	public CrystalType plusLevel(int level)
+	public CrystalType plusLevel(int levelValue)
 	{
-		level += _level;
-		
+		final int level = levelValue + _level;
 		if (level >= CrystalType.R99.getLevel())
 		{
 			return CrystalType.R99;
 		}
-		
 		if (level <= CrystalType.NONE.getLevel())
 		{
 			return CrystalType.NONE;
 		}
-		
 		return getByLevel(level);
 	}
 	
@@ -112,7 +109,6 @@ public enum CrystalType
 				return crystalType;
 			}
 		}
-		
 		return null;
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 0d4f9a86ae..e8e41c297d 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 48ad960e2c..5f118bc653 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -334,16 +334,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_6.0_Fafurion/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index f76b31cabd..c2d47b4e25 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html") || event.equals("31092-05.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 85c6564f6b..655b32f8c8 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -469,8 +469,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 1452cec5c2..d7aedac1fc 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index ca6796a7e8..9450fa0306 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index cf0450ca2c..db6866d6d9 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -344,9 +345,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -364,6 +365,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index b872456e17..2872dc8d60 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 82a3bdf30c..726aa7e4a2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index a8d15dab96..3783f9e2fb 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -306,30 +306,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
index a3dcfc6262..1e97c3dd8a 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -189,12 +189,9 @@ public class Q00663_SeductiveWhispers extends Quest
 				// practice
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 1)
 				{
-					event = "30846-13.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 1);
+					return "30846-13.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 1);
 				break;
 			}
 			case "30846-22.html":
@@ -207,8 +204,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, true);
-				break;
+				return play(player, true, true);
 			}
 			case "30846-23.html":
 			{
@@ -221,19 +217,15 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				event = play(player, false, true);
-				break;
+				return play(player, false, true);
 			}
 			case "30846-15.html":
 			{
 				if (getQuestItemsCount(player, SPIRIT_BEAD) < 50)
 				{
-					event = "30846-08.html";
-				}
-				else
-				{
-					takeItems(player, SPIRIT_BEAD, 50);
+					return "30846-08.html";
 				}
+				takeItems(player, SPIRIT_BEAD, 50);
 				break;
 			}
 			case "30846-16.html":
@@ -247,8 +239,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					playerCard = getRandomCard();
 				}
-				event = play(player, true, false);
-				break;
+				return play(player, true, false);
 			}
 			case "30846-17.html":
 			{
@@ -262,9 +253,7 @@ public class Q00663_SeductiveWhispers extends Quest
 				{
 					npcCard = getRandomCard();
 				}
-				
-				event = play(player, false, false);
-				break;
+				return play(player, false, false);
 			}
 			case "30846-20.html":
 			{
@@ -484,6 +473,7 @@ public class Q00663_SeductiveWhispers extends Quest
 	{
 		SUN("Sun card"),
 		MOON("Moon card");
+		
 		private String _name;
 		
 		Side(String name)
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
index 74da698bf9..28e2cfb72c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java
@@ -501,9 +501,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 9295c011bf..9db6c625bf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 9305ea230d..003d4fbfc2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -193,14 +193,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -274,8 +275,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -323,12 +325,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -343,9 +347,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -360,8 +365,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
index 90f1476f7d..f977f75549 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Party.java
@@ -825,17 +825,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -881,10 +881,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 480145c52f..b326dc412d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -665,12 +665,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -697,6 +698,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -744,8 +746,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 92812da903..686bc950eb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3152,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3205,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3219,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3996,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4364,7 +4379,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4382,6 +4397,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4481,20 +4497,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4503,14 +4521,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4518,45 +4536,45 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5060,8 +5078,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5070,8 +5089,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index d40e9b291a..ebd402ef2a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2024,13 +2024,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2701,12 +2703,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2747,12 +2744,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3424,8 +3416,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3438,7 +3430,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3452,14 +3444,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3696,8 +3688,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3706,33 +3698,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3744,7 +3736,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4611,11 +4603,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8254,32 +8247,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8292,7 +8287,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8306,7 +8301,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8319,32 +8314,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8352,11 +8347,11 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			// Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
-			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
+			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((usedSkill.getId() == 10020) || (usedSkill.getId() == 10021)))
 			{
 				sendPacket(sm);
 				return false;
@@ -8372,20 +8367,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8399,9 +8394,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8415,27 +8410,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8445,7 +8440,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8457,7 +8452,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index c5ed8ee0a3..cdfad62e04 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -96,7 +96,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -106,6 +106,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 		
 		// Removed used by new Clan system.
@@ -491,9 +495,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -534,13 +538,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 6a054c8a2a..8f61edab69 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_HAS_REACHED_0_THE_MANA_ARMOR_HAS_DISAPPEARED);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 371c747183..5a9a618eab 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1075,8 +1075,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
index cd0825217b..f5941e519f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index ce68e8c1d2..b4b58f0fcd 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
index f04f648bc1..2920bda8fa 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
@@ -87,20 +87,17 @@ public enum CrystalType
 		return getLevel() < crystalType.getLevel();
 	}
 	
-	public CrystalType plusLevel(int level)
+	public CrystalType plusLevel(int levelValue)
 	{
-		level += _level;
-		
+		final int level = levelValue + _level;
 		if (level >= CrystalType.R110.getLevel())
 		{
 			return CrystalType.R110;
 		}
-		
 		if (level <= CrystalType.NONE.getLevel())
 		{
 			return CrystalType.NONE;
 		}
-		
 		return getByLevel(level);
 	}
 	
@@ -113,7 +110,6 @@ public enum CrystalType
 				return crystalType;
 			}
 		}
-		
 		return null;
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 0d4f9a86ae..e8e41c297d 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 7be0f4f7cf..efa368987c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 48ad960e2c..5f118bc653 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -334,16 +334,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_7.0_PreludeOfWar/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
index 89294d0a6d..72ae7f1ca1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/FairySettlement/Wisp.java
@@ -54,9 +54,9 @@ public class Wisp extends AbstractNpcAI
 	{
 		if (event.equals("DELETE_NPC"))
 		{
-			params = new StatSet();
-			params.set("LOCATION_OBJECT", npc.getLocation());
-			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), params, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
+			final StatSet statSet = new StatSet();
+			statSet.set("LOCATION_OBJECT", npc.getLocation());
+			getTimers().addTimer("RESPAWN_WISP_" + npc.getObjectId(), statSet, getRandom(RESPAWN_MIN, RESPAWN_MAX), null, null);
 			npc.deleteMe();
 		}
 		else
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 0332700d1c..695f0d9f46 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index fa87ae2388..c2404b20cd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -358,6 +358,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -365,12 +366,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -381,33 +382,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
index 165cf39b27..fbe31b77b2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kimerian/KimerianCommon.java
@@ -92,23 +92,23 @@ public class KimerianCommon extends AbstractInstance
 			{
 				case "HELPER_TIME_ACTION":
 				{
-					player = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
-					if (player != null)
+					final PlayerInstance pc = npc.getVariables().getObject("PC_INSTANCE", PlayerInstance.class);
+					if (pc != null)
 					{
-						final double distance = npc.calculateDistance2D(player);
+						final double distance = npc.calculateDistance2D(pc);
 						if (distance > 1000)
 						{
-							npc.teleToLocation(new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50));
+							npc.teleToLocation(new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50));
 						}
 						else if (!npc.isAttackingNow() && (distance > 250))
 						{
 							npc.setRunning();
-							addMoveToDesire(npc, new Location(player.getX() + getRandom(-100, 100), player.getY() + getRandom(-100, 100), player.getZ() + 50), 23);
+							addMoveToDesire(npc, new Location(pc.getX() + getRandom(-100, 100), pc.getY() + getRandom(-100, 100), pc.getZ() + 50), 23);
 						}
 						else if (!npc.isInCombat() || !npc.isAttackingNow() || (npc.getTarget() == null))
 						{
-							final Creature monster = (Creature) player.getTarget();
-							if ((monster != null) && monster.isMonster() && player.isInCombat())
+							final Creature monster = (Creature) pc.getTarget();
+							if ((monster != null) && monster.isMonster() && pc.isInCombat())
 							{
 								addAttackDesire(npc, monster);
 							}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index f76b31cabd..c2d47b4e25 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -44,6 +44,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
+		String htmltext = event;
 		if (event.equals("31092-01.html") || event.equals("31092-05.html"))
 		{
 			return event;
@@ -51,7 +52,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 		else if (event.startsWith("exchange"))
 		{
 			final StringTokenizer st = new StringTokenizer(event, " ");
-			event = st.nextToken();
+			htmltext = st.nextToken();
 			if (!st.hasMoreElements())
 			{
 				return "31092-02.html";
@@ -78,7 +79,7 @@ public class BlackMarketeerOfMammon extends AbstractNpcAI
 			giveAdena(player, count, false);
 			return "31092-04.html";
 		}
-		return super.onAdvEvent(event, npc, player);
+		return super.onAdvEvent(htmltext, npc, player);
 	}
 	
 	public static void main(String[] args)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
index c83833a97a..22555c774f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/CastleCourtMagician/CastleCourtMagician.java
@@ -386,8 +386,9 @@ public class CastleCourtMagician extends AbstractNpcAI
 		return ((player.getClan() != null) && (player.getClanId() == npc.getCastle().getOwnerId())) ? "courtmagician.html" : "courtmagician-01.html";
 	}
 	
-	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int index)
+	private void showClassSpecificMultisell(PlayerInstance player, Npc npc, int indexValue)
 	{
+		int index = indexValue;
 		for (CategoryType ct : AWAKENED_CT)
 		{
 			if (player.isInCategory(ct))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 85c6564f6b..655b32f8c8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -469,8 +469,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index b7b0c532cd..8cd68ed6a4 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
index 06d2fcb5e6..ec837715ac 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/HermuncusMinion/HermuncusMinion.java
@@ -89,11 +89,11 @@ public class HermuncusMinion extends AbstractNpcAI
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		String htmltext = null;
-		final StringTokenizer st = new StringTokenizer(event, " ");
-		event = st.nextToken();
+		final StringTokenizer st = new StringTokenizer(eventValue, " ");
+		final String event = st.nextToken();
 		if (event.equals("teleportList"))
 		{
 			if (!player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index f206048cbb..ecbf56f5a2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -1098,8 +1098,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1201,7 +1202,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1214,6 +1215,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index cf0450ca2c..db6866d6d9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -344,9 +345,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -364,6 +365,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index b872456e17..2872dc8d60 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 82a3bdf30c..726aa7e4a2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
index 577863c42f..b723cb897a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/Nursery/Nursery.java
@@ -98,11 +98,11 @@ public class Nursery extends AbstractInstance
 					{
 						if (gameTime == 0)
 						{
-							player = instance.getFirstPlayer();
-							if ((player != null) && hasQuestItems(player, SCORE_ITEM))
+							final PlayerInstance firstPlayer = instance.getFirstPlayer();
+							if ((firstPlayer != null) && hasQuestItems(firstPlayer, SCORE_ITEM))
 							{
-								final int itemCount = (int) getQuestItemsCount(player, SCORE_ITEM);
-								takeItems(player, SCORE_ITEM, itemCount);
+								final int itemCount = (int) getQuestItemsCount(firstPlayer, SCORE_ITEM);
+								takeItems(firstPlayer, SCORE_ITEM, itemCount);
 								npcVars.increaseInt("GAME_POINTS", 0, itemCount);
 							}
 							instance.despawnGroup("GAME_MONSTERS");
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 8814c63cf8..5ebfa9ec7f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -102,7 +102,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -123,13 +123,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java
index 6d0d1c951b..46ea132ee5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/GameServer.java
@@ -505,9 +505,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java
index e81e4222dc..36eae89d70 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/Shutdown.java
@@ -99,11 +99,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index bc89e3ee87..0cb364e8eb 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 4a34a0986d..4f7319f59f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 946f19f842..80f5a8bbbc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
index 23ed172e75..0ce51ab4dc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Party.java
@@ -824,17 +824,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -888,10 +888,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java
index 6a297266e9..27462e0995 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index b8ca085ee2..bd6cc50adc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -673,12 +673,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -705,6 +706,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -752,8 +754,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ed493ebd29..30d8f679d1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -728,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1092,7 +1100,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				case TWOHANDCROSSBOW:
 				{
 					crossbow = true;
-					// fallthough
+					// fallthrough
 				}
 				case BOW:
 				{
@@ -1247,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3151,9 +3160,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3204,12 +3213,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3218,6 +3227,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3995,13 +4009,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4363,7 +4378,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4381,6 +4396,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4480,20 +4496,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4502,14 +4520,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4517,45 +4535,45 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5059,8 +5077,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5069,8 +5088,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 9a4342aec4..ea559de12e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2037,13 +2037,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2632,12 +2634,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2678,12 +2675,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3355,8 +3347,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3369,7 +3361,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3383,14 +3375,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3627,8 +3619,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3637,33 +3629,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3675,7 +3667,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4542,11 +4534,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8235,32 +8228,34 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// Alter skills
@@ -8273,7 +8268,7 @@ public class PlayerInstance extends Playable
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8287,7 +8282,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8300,32 +8295,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8333,11 +8328,11 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			// Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active.
-			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((skill.getId() == 10020) || (skill.getId() == 10021)))
+			if ((getEffectList().getBuffInfoBySkillId(10017) == null) && ((usedSkill.getId() == 10020) || (usedSkill.getId() == 10021)))
 			{
 				sendPacket(sm);
 				return false;
@@ -8353,20 +8348,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8380,9 +8375,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8396,27 +8391,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target, true))
+		if (!usedSkill.checkCondition(this, target, true))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8426,7 +8421,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8438,7 +8433,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d4525061e2..3c732fd208 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -96,7 +96,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -106,6 +106,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -405,18 +408,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 		
 		// Removed used by new Clan system.
@@ -489,9 +493,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -532,13 +536,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 6a054c8a2a..8f61edab69 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_HAS_REACHED_0_THE_MANA_ARMOR_HAS_DISAPPEARED);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 9ea0f70234..ffc08f8ee5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -950,13 +950,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -966,13 +966,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
index ad442456e9..f086d3cc5d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1074,8 +1074,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
index cd0825217b..f5941e519f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -281,9 +281,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -291,6 +291,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -327,21 +328,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -371,6 +374,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java
index fcfdedd4f0..13995b8e2e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -190,10 +190,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f65705b7ae..af131971eb 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2188,9 +2188,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2201,17 +2201,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2230,7 +2232,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2582,16 +2584,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2602,6 +2604,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2872,29 +2875,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2932,10 +2935,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2950,7 +2953,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2967,6 +2971,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index ce68e8c1d2..b4b58f0fcd 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index e368c9ec27..086246cddf 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 2f955e248b..e4fb5a1e1a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
index f04f648bc1..2920bda8fa 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/items/type/CrystalType.java
@@ -87,20 +87,17 @@ public enum CrystalType
 		return getLevel() < crystalType.getLevel();
 	}
 	
-	public CrystalType plusLevel(int level)
+	public CrystalType plusLevel(int levelValue)
 	{
-		level += _level;
-		
+		final int level = levelValue + _level;
 		if (level >= CrystalType.R110.getLevel())
 		{
 			return CrystalType.R110;
 		}
-		
 		if (level <= CrystalType.NONE.getLevel())
 		{
 			return CrystalType.NONE;
 		}
-		
 		return getByLevel(level);
 	}
 	
@@ -113,7 +110,6 @@ public enum CrystalType
 				return crystalType;
 			}
 		}
-		
 		return null;
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 557bb2aaae..ebbe6ed0d0 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index d4380e6103..c533cfb56d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 48ad960e2c..5f118bc653 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -334,16 +334,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_C1_HarbingersOfWar/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java
index 4d42322c15..f0dcba141d 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java
@@ -499,7 +499,7 @@ public class AdminCommands extends Thread
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void listCharacters(ClientThread client, int page)
+	private void listCharacters(ClientThread client, int pageValue)
 	{
 		final PlayerInstance activeChar = client.getActiveChar();
 		final Collection<PlayerInstance> allWorldPlayers = World.getInstance().getAllPlayers();
@@ -511,6 +511,7 @@ public class AdminCommands extends Thread
 		{
 			++maxPages;
 		}
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c56fb10c7a..4598cb7390 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -396,9 +396,9 @@ public abstract class Creature extends WorldObject
 		final StatusUpdate su = new StatusUpdate(getObjectId());
 		su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp());
 		su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp());
-		for (int i = 0; i < list.size(); ++i)
+		for (Creature element : list)
 		{
-			final Creature temp = list.get(i);
+			final Creature temp = element;
 			if (!(temp instanceof PlayerInstance))
 			{
 				continue;
@@ -881,19 +881,21 @@ public abstract class Creature extends WorldObject
 		}
 	}
 	
-	private synchronized void calculateMovement(int x, int y, int z, double distance)
+	private synchronized void calculateMovement(int x, int y, int z, double distanceValue)
 	{
 		if (isMoving())
 		{
 			stopMove();
 		}
-		if ((getPawnTarget() != null) && (distance <= getAttackRange()) && (getCurrentState() == CreatureState.FOLLOW))
+		if ((getPawnTarget() != null) && (distanceValue <= getAttackRange()) && (getCurrentState() == CreatureState.FOLLOW))
 		{
 			_moveTask = ThreadPool.schedule(new ArriveTask(this), 3000);
 			return;
 		}
+		
 		int dx = x - getX();
 		int dy = y - getY();
+		double distance = distanceValue;
 		if (_moveOffset > 0)
 		{
 			if ((distance - _moveOffset) <= 0.0)
@@ -908,6 +910,7 @@ public abstract class Creature extends WorldObject
 			dy = (int) (-(Math.sin(angle) * distance));
 			dx = (int) (-(Math.cos(angle) * distance));
 		}
+		
 		if ((distance > 0.0) || (getPawnTarget() != null))
 		{
 			final float speed = _effectiveSpeed;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 24c15919af..a3aa117ad9 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -221,9 +221,8 @@ public class NpcInstance extends Creature
 	
 	public void insertObjectIdAndShowChatWindow(PlayerInstance player, String content)
 	{
-		content = content.replace("%objectId%", String.valueOf(getObjectId()));
 		final NpcHtmlMessage npcReply = new NpcHtmlMessage(5);
-		npcReply.setHtml(content);
+		npcReply.setHtml(content.replace("%objectId%", String.valueOf(getObjectId())));
 		player.sendPacket(npcReply);
 	}
 	
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 32c2f5fcbe..664c574d3f 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -94,8 +94,9 @@ public class PetInstance extends Creature
 		player.sendPacket(new MyTargetSelected(getObjectId(), player.getLevel() - getLevel()));
 	}
 	
-	public void setSummonHp(int hp)
+	public void setSummonHp(int value)
 	{
+		int hp = value;
 		if (hp == 0)
 		{
 			hp = 5000;
@@ -130,31 +131,19 @@ public class PetInstance extends Creature
 	@Override
 	public void setWalkSpeed(int walkSpeed)
 	{
-		if (walkSpeed < 24)
-		{
-			walkSpeed = 24;
-		}
-		super.setWalkSpeed(walkSpeed);
+		super.setWalkSpeed(Math.max(24, walkSpeed));
 	}
 	
 	@Override
 	public void setPhysicalDefense(int pdef)
 	{
-		if (pdef < 100)
-		{
-			pdef = 100;
-		}
-		super.setPhysicalDefense(pdef);
+		super.setPhysicalDefense(Math.max(100, pdef));
 	}
 	
 	@Override
 	public void setRunSpeed(int runSpeed)
 	{
-		if (runSpeed < 125)
-		{
-			runSpeed = 125;
-		}
-		super.setRunSpeed(runSpeed);
+		super.setRunSpeed(Math.max(125, runSpeed));
 	}
 	
 	public int getPetId()
@@ -322,12 +311,14 @@ public class PetInstance extends Creature
 	}
 	
 	@Override
-	public void setPhysicalAttack(int physicalAttack)
+	public void setPhysicalAttack(int value)
 	{
+		int physicalAttack = value;
 		if (physicalAttack < 100)
 		{
 			physicalAttack = 100;
 		}
+		
 		super.setPhysicalAttack(physicalAttack);
 		_dummyWeapon = new Weapon();
 		_dummyWeapon.setPDamage(physicalAttack);
@@ -503,9 +494,9 @@ public class PetInstance extends Creature
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit)
+	public void dropItemHere(ItemInstance item)
 	{
-		dropit = getInventory().dropItem(dropit.getObjectId(), dropit.getCount());
+		final ItemInstance dropit = getInventory().dropItem(item.getObjectId(), item.getCount());
 		if (dropit != null)
 		{
 			dropit.setX(getX());
@@ -544,11 +535,7 @@ public class PetInstance extends Creature
 	
 	public void setAttackRange(int range)
 	{
-		if (range < 36)
-		{
-			range = 36;
-		}
-		_attackRange = range;
+		_attackRange = Math.max(36, range);
 	}
 	
 	public void setFollowStatus(boolean value)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 444160073e..5bae7c0915 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -130,13 +130,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java
index ec664fd347..f8624b9747 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/BlowfishEngine.java
@@ -91,6 +91,7 @@ public class BlowfishEngine
 		return ((S0[x >>> 24] + S1[(x >>> 16) & 0xFF]) ^ S2[(x >>> 8) & 0xFF]) + S3[x & 0xFF];
 	}
 	
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
index 9cf36b2a45..ff8681906f 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
@@ -52,13 +52,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -99,12 +100,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -114,10 +116,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -126,13 +130,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Util.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Util.java
index f99a79a190..42a479282a 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Util.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Util.java
@@ -107,9 +107,9 @@ public class Util
 		return number;
 	}
 	
-	public static void printSection(String s)
+	public static void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs
index 699dd665c7..3f93b559d5 100644
--- a/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_C6_Interlude/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
index aff147a4b2..c0b1d0d385 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
@@ -897,7 +897,7 @@ public class Valakas extends Quest
 		}
 	}
 	
-	public void callSkillAI(NpcInstance npc, Creature c2, Skill skill)
+	public void callSkillAI(NpcInstance npc, Creature creature, Skill skill)
 	{
 		final QuestTimer timer = getQuestTimer("launch_random_skill", npc, null);
 		if (npc == null)
@@ -914,16 +914,18 @@ public class Valakas extends Quest
 			return;
 		}
 		
-		if ((c2 == null) || c2.isDead() || (timer == null))
+		Creature currentTarget = creature;
+		if ((currentTarget == null) || currentTarget.isDead() || (timer == null))
 		{
-			c2 = getRandomTarget(npc); // just in case if hate AI fail
+			currentTarget = getRandomTarget(npc); // just in case if hate AI fail
 			if (timer == null)
 			{
 				startQuestTimer("launch_random_skill", 500, npc, null, true);
 				return;
 			}
 		}
-		final Creature target = c2;
+		
+		final Creature target = currentTarget;
 		if ((target == null) || target.isDead())
 		{
 			return;
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java
index 0c4a5707e8..3e07d7d692 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java
@@ -179,7 +179,7 @@ public class NewbieHelper extends Quest
 		}
 		
 		String htmltext = event;
-		player = qs1.getPlayer();
+		// player = qs1.getPlayer();
 		
 		final int ex = qs2.getInt("Ex");
 		final int classId = qs1.getPlayer().getClassId().getId();
@@ -241,6 +241,7 @@ public class NewbieHelper extends Quest
 				}
 			}
 		}
+		
 		return htmltext;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java
index 348c20c8e1..f93cc13f6b 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java
@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 
 public class SummonMinions extends Quest
 {
-	private static int HasSpawned;
+	private static int hasSpawned;
 	private static Set<Integer> myTrackingSet = new CopyOnWriteArraySet<>(); // Used to track instances of npcs
 	private final Map<Integer, List<PlayerInstance>> _attackersList = new ConcurrentHashMap<>();
 	private static final Map<Integer, Integer[]> MINIONS = new HashMap<>();
@@ -148,20 +148,22 @@ public class SummonMinions extends Quest
 	{
 		final int npcId = npc.getNpcId();
 		final int npcObjId = npc.getObjectId();
+		
 		if (MINIONS.containsKey(npcId))
 		{
 			if (!myTrackingSet.contains(npcObjId)) // this allows to handle multiple instances of npc
 			{
 				myTrackingSet.add(npcObjId);
-				HasSpawned = npcObjId;
+				hasSpawned = npcObjId;
 			}
-			if (HasSpawned == npcObjId)
+			
+			if (hasSpawned == npcObjId)
 			{
 				if ((npcId == 22030) || (npcId == 22032) || (npcId == 22038)) // mobs that summon minions only on certain hp
 				{
 					if (npc.getStatus().getCurrentHp() < (npc.getMaxHp() / 2))
 					{
-						HasSpawned = 0;
+						hasSpawned = 0;
 						if (Rnd.get(100) < 33) // mobs that summon minions only on certain chance
 						{
 							final Integer[] minions = MINIONS.get(npcId);
@@ -177,13 +179,15 @@ public class SummonMinions extends Quest
 				}
 				else if ((npcId == 22257) || (npcId == 22258) || (npcId == 22259) || (npcId == 22260) || (npcId == 22261) || (npcId == 22262) || (npcId == 22263) || (npcId == 22264) || (npcId == 22265) || (npcId == 22266))
 				{
+					PlayerInstance currentAttacker = attacker;
 					if (isPet)
 					{
-						attacker = attacker.getPet().getOwner();
+						currentAttacker = attacker.getPet().getOwner();
 					}
-					if (attacker.getParty() != null)
+					
+					if (currentAttacker.getParty() != null)
 					{
-						for (PlayerInstance member : attacker.getParty().getPartyMembers())
+						for (PlayerInstance member : currentAttacker.getParty().getPartyMembers())
 						{
 							if (_attackersList.get(npcObjId) == null)
 							{
@@ -200,30 +204,30 @@ public class SummonMinions extends Quest
 					else if (_attackersList.get(npcObjId) == null)
 					{
 						final List<PlayerInstance> player = new ArrayList<>();
-						player.add(attacker);
+						player.add(currentAttacker);
 						_attackersList.put(npcObjId, player);
 					}
-					else if (!_attackersList.get(npcObjId).contains(attacker))
+					else if (!_attackersList.get(npcObjId).contains(currentAttacker))
 					{
-						_attackersList.get(npcObjId).add(attacker);
+						_attackersList.get(npcObjId).add(currentAttacker);
 					}
-					if (((attacker.getParty() != null) && (attacker.getParty().getMemberCount() > 2)) || (_attackersList.get(npcObjId).size() > 2)) // Just to make sure..
+					
+					if (((currentAttacker.getParty() != null) && (currentAttacker.getParty().getMemberCount() > 2)) || (_attackersList.get(npcObjId).size() > 2)) // Just to make sure..
 					{
-						HasSpawned = 0;
+						hasSpawned = 0;
 						final Integer[] minions = MINIONS.get(npcId);
 						for (Integer minion : minions)
 						{
 							final Attackable newNpc = (Attackable) addSpawn(minion, npc.getX() + Rnd.get(-150, 150), npc.getY() + Rnd.get(-150, 150), npc.getZ(), 0, false, 0);
 							newNpc.setRunning();
-							newNpc.addDamageHate(attacker, 0, 999);
-							newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker);
+							newNpc.addDamageHate(currentAttacker, 0, 999);
+							newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, currentAttacker);
 						}
 					}
 				}
-				else
-				// mobs without special conditions
+				else // mobs without special conditions
 				{
-					HasSpawned = 0;
+					hasSpawned = 0;
 					final Integer[] minions = MINIONS.get(npcId);
 					if (npcId != 20767)
 					{
@@ -249,10 +253,12 @@ public class SummonMinions extends Quest
 				}
 			}
 		}
+		
 		if (_attackersList.get(npcObjId) != null)
 		{
 			_attackersList.get(npcObjId).clear();
 		}
+		
 		return super.onAttack(npc, attacker, damage, isPet);
 	}
 	
@@ -261,10 +267,12 @@ public class SummonMinions extends Quest
 	{
 		final int npcId = npc.getNpcId();
 		final int npcObjId = npc.getObjectId();
+		
 		if (MINIONS.containsKey(npcId))
 		{
 			myTrackingSet.remove(npcObjId);
 		}
+		
 		return super.onKill(npc, killer, isPet);
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java
index a99bb0a1c2..8c13ef19be 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java
@@ -164,8 +164,8 @@ public class Q242_PossessorOfAPreciousSoul extends Quest
 		// Spawn Fallen Unicorn
 		else if (event.equals("sfu"))
 		{
-			npc = addSpawn(FALLEN_UNICORN, 85884, -76588, -3470, 0, false, 0);
-			npc.getSpawn().startRespawn();
+			final NpcInstance unicorn = addSpawn(FALLEN_UNICORN, 85884, -76588, -3470, 0, false, 0);
+			unicorn.getSpawn().startRespawn();
 			return null;
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
index 0081fcb251..68ae78577a 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java
@@ -408,119 +408,144 @@ public class Q335_TheSongOfTheHunter extends Quest
 			return event;
 		}
 		
+		String htmltext = event;
 		final int state = st.getState();
-		if ("30744_03.htm".equalsIgnoreCase(event) && (state == 1))
+		if ("30744_03.htm".equals(htmltext))
 		{
-			if (st.getQuestItemsCount(TEST_INSTRUCTIONS1) == 0)
+			if (state == 1)
 			{
-				st.giveItems(TEST_INSTRUCTIONS1, 1);
+				if (st.getQuestItemsCount(TEST_INSTRUCTIONS1) == 0)
+				{
+					st.giveItems(TEST_INSTRUCTIONS1, 1);
+				}
+				st.setState(State.STARTED);
+				st.set("cond", "1");
+				st.playSound("ItemSound.quest_accept");
 			}
-			st.setState(State.STARTED);
-			st.set("cond", "1");
-			st.playSound("ItemSound.quest_accept");
 		}
-		else if ("30744_09.htm".equalsIgnoreCase(event) && (state == 2))
+		else if ("30744_09.htm".equals(htmltext))
 		{
-			if (GetCurrentRequest(st, REQUESTS1) != null)
+			if (state == 2)
 			{
-				return "30744_09a.htm";
+				if (GetCurrentRequest(st, REQUESTS1) != null)
+				{
+					return "30744_09a.htm";
+				}
+				if (st.getQuestItemsCount(TEST_INSTRUCTIONS2) == 0)
+				{
+					st.playSound("ItemSound.quest_middle");
+					st.giveItems(TEST_INSTRUCTIONS2, 1);
+				}
 			}
-			if (st.getQuestItemsCount(TEST_INSTRUCTIONS2) == 0)
+		}
+		else if ("30744_16.htm".equals(htmltext))
+		{
+			if (state == 2)
 			{
+				if (st.getQuestItemsCount(LAUREL_LEAF_PIN) >= 20)
+				{
+					st.giveItems(57, 20000);
+					htmltext = "30744_17.htm";
+				}
+				st.playSound("ItemSound.quest_finish");
+				st.exitQuest(true);
+			}
+		}
+		else if ("30746_03.htm".equals(htmltext))
+		{
+			if (state == 2)
+			{
+				if ((st.getQuestItemsCount(CIRCLE_HUNTER_LICENSE1) == 0) && (st.getQuestItemsCount(CIRCLE_HUNTER_LICENSE2) == 0))
+				{
+					return null;
+				}
+				if (st.getQuestItemsCount(CYBELLINS_DAGGER) == 0)
+				{
+					st.giveItems(CYBELLINS_DAGGER, 1);
+				}
+				if (st.getQuestItemsCount(CYBELLINS_REQUEST) == 0)
+				{
+					st.giveItems(CYBELLINS_REQUEST, 1);
+				}
+				for (int i : Q_BLOOD_CRYSTAL)
+				{
+					st.takeItems(i, -1);
+				}
 				st.playSound("ItemSound.quest_middle");
-				st.giveItems(TEST_INSTRUCTIONS2, 1);
+				st.giveItems(Q_BLOOD_CRYSTAL[1], 1);
 			}
 		}
-		else if ("30744_16.htm".equalsIgnoreCase(event) && (state == 2))
+		else if ("30746_06.htm".equals(htmltext))
 		{
-			if (st.getQuestItemsCount(LAUREL_LEAF_PIN) >= 20)
+			if (state == 2)
 			{
-				st.giveItems(57, 20000);
-				event = "30744_17.htm";
-			}
-			st.playSound("ItemSound.quest_finish");
-			st.exitQuest(true);
-		}
-		else if ("30746_03.htm".equalsIgnoreCase(event) && (state == 2))
-		{
-			if ((st.getQuestItemsCount(CIRCLE_HUNTER_LICENSE1) == 0) && (st.getQuestItemsCount(CIRCLE_HUNTER_LICENSE2) == 0))
-			{
-				return null;
-			}
-			if (st.getQuestItemsCount(CYBELLINS_DAGGER) == 0)
-			{
-				st.giveItems(CYBELLINS_DAGGER, 1);
-			}
-			if (st.getQuestItemsCount(CYBELLINS_REQUEST) == 0)
-			{
-				st.giveItems(CYBELLINS_REQUEST, 1);
-			}
-			for (int i : Q_BLOOD_CRYSTAL)
-			{
-				st.takeItems(i, -1);
-			}
-			st.playSound("ItemSound.quest_middle");
-			st.giveItems(Q_BLOOD_CRYSTAL[1], 1);
-		}
-		else if ("30746_06.htm".equalsIgnoreCase(event) && (state == 2))
-		{
-			if (!Blood_Crystal2Adena(st, Get_Blood_Crystal_Level(st)))
-			{
-				return null;
+				if (!Blood_Crystal2Adena(st, Get_Blood_Crystal_Level(st)))
+				{
+					return null;
+				}
 			}
 		}
-		else if ("30746_10.htm".equalsIgnoreCase(event) && (state == 2))
+		else if ("30746_10.htm".equals(htmltext))
 		{
-			st.takeItems(CYBELLINS_DAGGER, -1);
-			st.takeItems(CYBELLINS_REQUEST, -1);
-			for (int i : Q_BLOOD_CRYSTAL)
+			if (state == 2)
 			{
-				st.takeItems(i, -1);
+				st.takeItems(CYBELLINS_DAGGER, -1);
+				st.takeItems(CYBELLINS_REQUEST, -1);
+				for (int i : Q_BLOOD_CRYSTAL)
+				{
+					st.takeItems(i, -1);
+				}
 			}
 		}
-		else if ("30745_02.htm".equalsIgnoreCase(event) && (state == 2))
+		else if ("30745_02.htm".equals(htmltext))
 		{
-			if (st.getQuestItemsCount(TEST_INSTRUCTIONS2) > 0)
+			if (state == 2)
 			{
-				return "30745_03.htm";
+				if (st.getQuestItemsCount(TEST_INSTRUCTIONS2) > 0)
+				{
+					return "30745_03.htm";
+				}
 			}
 		}
-		else if ("30745_05b.htm".equalsIgnoreCase(event) && (state == 2))
+		else if ("30745_05b.htm".equals(htmltext))
 		{
-			if (st.getQuestItemsCount(LAUREL_LEAF_PIN) > 0)
+			if (state == 2)
 			{
-				st.takeItems(LAUREL_LEAF_PIN, 1);
-			}
-			for (Request r : REQUESTS1)
-			{
-				st.takeItems(r.request_id, -1);
-				st.takeItems(r.request_item, -1);
-			}
-			for (Request r : REQUESTS2)
-			{
-				st.takeItems(r.request_id, -1);
-				st.takeItems(r.request_item, -1);
+				if (st.getQuestItemsCount(LAUREL_LEAF_PIN) > 0)
+				{
+					st.takeItems(LAUREL_LEAF_PIN, 1);
+				}
+				for (Request r : REQUESTS1)
+				{
+					st.takeItems(r.request_id, -1);
+					st.takeItems(r.request_item, -1);
+				}
+				for (Request r : REQUESTS2)
+				{
+					st.takeItems(r.request_id, -1);
+					st.takeItems(r.request_item, -1);
+				}
 			}
 		}
-		else
+		else if (state == 2)
 		{
-			if ("30745-list1".equalsIgnoreCase(event) && (state == 2))
+			if ("30745-list1".equals(htmltext))
 			{
 				GenList(st);
 				return FormatList(st, REQUESTS1);
 			}
-			if ("30745-list2".equalsIgnoreCase(event) && (state == 2))
+			if ("30745-list2".equals(htmltext))
 			{
 				GenList(st);
 				return FormatList(st, REQUESTS2);
 			}
-			if (event.startsWith("30745-request-") && (state == 2))
+			if (htmltext.startsWith("30745-request-"))
 			{
-				event = event.replaceFirst("30745-request-", "");
+				htmltext = htmltext.replaceFirst("30745-request-", "");
 				int requestId;
 				try
 				{
-					requestId = Integer.parseInt(event);
+					requestId = Integer.parseInt(htmltext);
 				}
 				catch (Exception e)
 				{
@@ -534,7 +559,8 @@ public class Q335_TheSongOfTheHunter extends Quest
 				return "30745-" + requestId + ".htm";
 			}
 		}
-		return event;
+		
+		return htmltext;
 	}
 	
 	@Override
@@ -975,11 +1001,12 @@ public class Q335_TheSongOfTheHunter extends Quest
 		return result;
 	}
 	
-	private static int[] unpackInt(int a, int bits)
+	private static int[] unpackInt(int value, int bits)
 	{
 		final int m = 32 / bits;
 		final int mval = (int) Math.pow(2.0, bits);
 		final int[] result = new int[m];
+		int a = value;
 		for (int i = m; i > 0; --i)
 		{
 			final int next = a;
diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
index 4614fa88d8..dabd236f1f 100644
--- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java
@@ -437,10 +437,11 @@ public class Q384_WarehouseKeepersPastime extends Quest
 	{
 		final String[] playerArray = st.getString("playerArray").split("");
 		final String[] board = st.getString("board").split("");
+		String result = htmltext;
 		for (int i = 1; i < 10; i++)
 		{
-			htmltext = htmltext.replace("<?Cell" + i + "?>", (Util.contains(playerArray, board[i])) ? board[i] : "?");
+			result = result.replace("<?Cell" + i + "?>", (Util.contains(playerArray, board[i])) ? board[i] : "?");
 		}
-		return htmltext;
+		return result;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/BlowfishEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/BlowfishEngine.java
index f3cdf962a9..608c7fe5b9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/BlowfishEngine.java
@@ -1178,6 +1178,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/LoginCrypt.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/LoginCrypt.java
index c28c0435fd..8144e59bba 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/LoginCrypt.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/crypt/LoginCrypt.java
@@ -62,28 +62,30 @@ public class LoginCrypt
 	
 	public int encrypt(byte[] raw, int offset, int size) throws IOException
 	{
+		int newSize = size;
 		// reserve checksum
-		size += 4;
+		newSize += 4;
 		
 		if (_static)
 		{
 			// reserve for XOR "key"
-			size += 4;
+			newSize += 4;
 			
 			// padding
-			size += 8 - (size % 8);
-			NewCrypt.encXORPass(raw, offset, size, Rnd.nextInt());
-			_staticCrypt.crypt(raw, offset, size);
+			newSize += 8 - (newSize % 8);
+			NewCrypt.encXORPass(raw, offset, newSize, Rnd.nextInt());
+			_staticCrypt.crypt(raw, offset, newSize);
 			
 			_static = false;
 		}
 		else
 		{
 			// padding
-			size += 8 - (size % 8);
-			NewCrypt.appendChecksum(raw, offset, size);
-			_crypt.crypt(raw, offset, size);
+			newSize += 8 - (newSize % 8);
+			NewCrypt.appendChecksum(raw, offset, newSize);
+			_crypt.crypt(raw, offset, newSize);
 		}
-		return size;
+		
+		return newSize;
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/mmocore/SelectorThread.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/mmocore/SelectorThread.java
index 259e103667..a935406972 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/mmocore/SelectorThread.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/mmocore/SelectorThread.java
@@ -243,6 +243,7 @@ public class SelectorThread<T extends MMOClient<?>>extends Thread
 		}
 	}
 	
+	@SuppressWarnings("all")
 	private final void acceptConnection(SelectionKey key, MMOConnection<T> con)
 	{
 		final ServerSocketChannel ssc = (ServerSocketChannel) key.channel();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Util.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Util.java
index 2f8c8bf2f8..21d42a0e3e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Util.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/commons/util/Util.java
@@ -106,9 +106,9 @@ public class Util
 		return number;
 	}
 	
-	public static void printSection(String s)
+	public static void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
index 8c9a49af0d..fdc786cf96 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
@@ -110,11 +110,8 @@ public class Shutdown extends Thread
 	 */
 	private Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
+		
 		if (restart)
 		{
 			_shutdownMode = GM_RESTART;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 4d1df91e4a..c5bf9a754b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -424,13 +424,14 @@ abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index bd0cfd5d2e..be17899820 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -305,13 +305,14 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	public void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	public void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
@@ -336,7 +337,6 @@ public class AttackableAI extends CreatureAI
 				
 				// Cancel the AI
 				_accessor.detachAI();
-				
 				return;
 			}
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index f04b889af8..c40e75afc4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -926,10 +926,10 @@ public class CreatureAI extends AbstractAI
 	 * <b><u>Example of use</u>:</b><br>
 	 * <li>PLayerAI, SummonAI</li><br>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -939,12 +939,12 @@ public class CreatureAI extends AbstractAI
 		}
 		
 		// skill radius -1
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false;
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target instanceof Creature)
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -998,7 +998,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
-			
+			int offset = offsetValue;
 			if ((target instanceof Creature) && !(target instanceof DoorInstance))
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
index c0bf68475f..47ca475bea 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
@@ -168,38 +168,41 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target instanceof Summon)
+		Creature currentTarget = target;
+		if (currentTarget instanceof Summon)
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius(owner, 1000, true, false))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
 		
 		// Check if the target is a PlayerInstance
-		if (target instanceof PlayerInstance)
+		if (currentTarget instanceof PlayerInstance)
 		{
 			// Check if the target isn't in silent move mode AND too far (>100)
-			if (((PlayerInstance) target).isSilentMoving() && !_actor.isInsideRadius(target, 250, false, false))
+			if (((PlayerInstance) currentTarget).isSilentMoving() && !_actor.isInsideRadius(currentTarget, 250, false, false))
 			{
 				return false;
 			}
 		}
+		
 		// Los Check Here
-		return _actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target);
+		return _actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget);
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	public synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	public synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
 			// Check if actor is not dead
@@ -232,7 +235,6 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 				
 				// Cancel the AI
 				_accessor.detachAI();
-				
 				return;
 			}
 		}
@@ -907,6 +909,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 		{
 			return;
 		}
+		
 		final Attackable me = (Attackable) _actor;
 		if (target != null)
 		{
@@ -914,8 +917,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -967,8 +969,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
index 26c4b8468c..2d22009ed8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
@@ -123,35 +123,37 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target instanceof Summon)
+		Creature currentTarget = target;
+		if (currentTarget instanceof Summon)
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius(owner, 1000, true, false))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
 		
 		// Check if the target is a PlayerInstance and if the target isn't in silent move mode AND too far (>100)
-		if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isSilentMoving() && !_actor.isInsideRadius(target, 250, false, false))
+		if ((currentTarget instanceof PlayerInstance) && ((PlayerInstance) currentTarget).isSilentMoving() && !_actor.isInsideRadius(currentTarget, 250, false, false))
 		{
 			return false;
 		}
 		
 		// Los Check Here
-		return _actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target);
+		return _actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget);
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	public void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	public void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		((Attackable) _actor).setReturningToSpawnPoint(false);
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
@@ -722,8 +724,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -774,8 +775,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java
index acb17ef204..719af94b82 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java
@@ -229,7 +229,7 @@ public class ClanBBSManager extends BaseBBSManager
 		send1002(activeChar, clan.getNotice(), "", "");
 	}
 	
-	private void sendClanList(PlayerInstance activeChar, int index)
+	private void sendClanList(PlayerInstance activeChar, int indexValue)
 	{
 		String content = HtmCache.getInstance().getHtm(CB_PATH + "clan/clanlist.htm");
 		
@@ -242,6 +242,7 @@ public class ClanBBSManager extends BaseBBSManager
 		}
 		
 		content = content.replace("%homebar%", sb.toString());
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
@@ -303,7 +304,6 @@ public class ClanBBSManager extends BaseBBSManager
 		}
 		
 		sb.append("</tr></table>");
-		
 		content = content.replace("%clanlist%", sb.toString());
 		separateAndSend(content, activeChar);
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
index 3dc6f0fdb6..53f9e3abb9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
@@ -315,7 +315,7 @@ public class MailBBSManager extends BaseBBSManager
 		showMailList(activeChar, page, type, "", "");
 	}
 	
-	private void showMailList(PlayerInstance activeChar, int page, MailType type, String sType, String search)
+	private void showMailList(PlayerInstance activeChar, int pageValue, MailType type, String sType, String search)
 	{
 		List<Mail> letters;
 		if (!sType.equals("") && !search.equals(""))
@@ -346,6 +346,7 @@ public class MailBBSManager extends BaseBBSManager
 		
 		final int countMails = getCountLetters(activeChar.getObjectId(), type, sType, search);
 		final int maxpage = getMaxPageId(countMails);
+		int page = pageValue;
 		if (page > maxpage)
 		{
 			page = maxpage;
@@ -522,7 +523,7 @@ public class MailBBSManager extends BaseBBSManager
 		send1002(activeChar, " ", "Re: " + letter.subject, "0");
 	}
 	
-	public void sendLetter(String recipients, String subject, String message, PlayerInstance activeChar)
+	public void sendLetter(String recipients, String subjectValue, String messageValue, PlayerInstance activeChar)
 	{
 		// Current time.
 		final long currentDate = Calendar.getInstance().getTimeInMillis();
@@ -546,13 +547,14 @@ public class MailBBSManager extends BaseBBSManager
 		}
 		
 		// Edit subject, if none.
+		String subject = subjectValue;
 		if ((subject == null) || subject.isEmpty())
 		{
 			subject = "(no subject)";
 		}
 		
 		// Edit message.
-		message = message.replace("\n", "<br1>");
+		String message = messageValue.replace("\n", "<br1>");
 		
 		try (Connection con = DatabaseFactory.getConnection())
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java
index b8ec0b61ab..c0fa5a41bb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java
@@ -73,16 +73,17 @@ public class SkillTable
 	public int getMaxLevel(int magicId, int level)
 	{
 		Skill temp;
-		while (level < 100)
+		int result = level;
+		while (result < 100)
 		{
-			level++;
-			temp = _skills.get(getSkillHashCode(magicId, level));
+			result++;
+			temp = _skills.get(getSkillHashCode(magicId, result));
 			if (temp == null)
 			{
-				return level - 1;
+				return result - 1;
 			}
 		}
-		return level;
+		return result;
 	}
 	
 	private static final WeaponType[] weaponDbMasks =
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index f68eb4fc81..cc4db33d07 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -139,9 +139,10 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
+		Node n = node;
 		n = n.getFirstChild();
 		if (n == null)
 		{
@@ -416,8 +417,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -470,9 +472,10 @@ public abstract class DocumentBase
 		return null;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -489,9 +492,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -508,8 +512,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -878,8 +883,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Lambda getLambda(Node n, Object template)
+	protected Lambda getLambda(Node node, Object template)
 	{
+		Node n = node;
 		final Node nval = n.getAttributes().getNamedItem("val");
 		if (nval != null)
 		{
@@ -917,6 +923,7 @@ public abstract class DocumentBase
 				{
 					return new LambdaConst(Double.parseDouble(getValue(field, template)));
 				}
+				
 				// failed
 				throw new IllegalArgumentException("Unknown value " + val);
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java
index 528a01c12e..eafb2dfa38 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentItem.java
@@ -149,8 +149,9 @@ final class DocumentItem extends DocumentBase
 		}
 	}
 	
-	protected void parseItem(Node n)
+	protected void parseItem(Node node)
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java
index 425b17d586..18920b358a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentSkill.java
@@ -113,8 +113,9 @@ final class DocumentSkill extends DocumentBase
 		}
 	}
 	
-	protected void parseSkill(Node n)
+	protected void parseSkill(Node node)
 	{
+		Node n = node;
 		final NamedNodeMap attrs = n.getAttributes();
 		int enchantLevels1 = 0;
 		int enchantLevels2 = 0;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index 7c03ec2a6d..0ea9e92924 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -484,19 +484,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instanceId
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, int instanceId)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, int instanceId)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index 8601662f15..09c482a29a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -166,10 +166,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -179,6 +179,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java
index d7ebddb7d4..d253ad1012 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java
@@ -209,22 +209,15 @@ public class AutoAnnouncementHandler
 	private final AutoAnnouncementInstance registerAnnouncement(int id, String announcementTexts, long chatDelay)
 	{
 		AutoAnnouncementInstance announcementInst = null;
-		if (chatDelay < 0)
-		{
-			chatDelay = DEFAULT_ANNOUNCEMENT_DELAY;
-		}
-		
 		if (_registeredAnnouncements.containsKey(id))
 		{
 			announcementInst = _registeredAnnouncements.get(id);
 		}
 		else
 		{
-			announcementInst = new AutoAnnouncementInstance(id, announcementTexts, chatDelay);
+			announcementInst = new AutoAnnouncementInstance(id, announcementTexts, chatDelay < 0 ? DEFAULT_ANNOUNCEMENT_DELAY : chatDelay);
 		}
-		
 		_registeredAnnouncements.put(id, announcementInst);
-		
 		return announcementInst;
 	}
 	
@@ -256,6 +249,7 @@ public class AutoAnnouncementHandler
 		{
 			LOGGER.warning("Could not Delete Auto Announcement in Database, Reason: " + e);
 		}
+		
 		return removeAnnouncement(announcementInst);
 	}
 	
@@ -273,7 +267,6 @@ public class AutoAnnouncementHandler
 		
 		_registeredAnnouncements.remove(announcementInst.getDefaultId());
 		announcementInst.setActive(false);
-		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java
index e69ee873e0..5ef7ccf0b4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java
@@ -126,18 +126,13 @@ public class AutoChatHandler implements SpawnListener
 	private final AutoChatInstance registerChat(int npcId, NpcInstance npcInst, String[] chatTexts, long chatDelay)
 	{
 		AutoChatInstance chatInst = null;
-		if (chatDelay < 0)
-		{
-			chatDelay = DEFAULT_CHAT_DELAY;
-		}
-		
 		if (_registeredChats.containsKey(npcId))
 		{
 			chatInst = _registeredChats.get(npcId);
 		}
 		else
 		{
-			chatInst = new AutoChatInstance(npcId, chatTexts, chatDelay, (npcInst == null));
+			chatInst = new AutoChatInstance(npcId, chatTexts, chatDelay < 0 ? DEFAULT_CHAT_DELAY : chatDelay, (npcInst == null));
 		}
 		
 		if (npcInst != null)
@@ -146,7 +141,6 @@ public class AutoChatHandler implements SpawnListener
 		}
 		
 		_registeredChats.put(npcId, chatInst);
-		
 		return chatInst;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
index 295c66d1dd..b4cf65fae5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminAnnouncements.java
@@ -141,12 +141,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
 			}
 			case "admin_announce":
 			{
-				// Call method from another class
-				if (Config.GM_ANNOUNCER_NAME)
-				{
-					command = command + " [ " + activeChar.getName() + " ]";
-				}
-				Announcements.getInstance().handleAnnounce(command, 15);
+				Announcements.getInstance().handleAnnounce(Config.GM_ANNOUNCER_NAME ? command + " [ " + activeChar.getName() + " ]" : command, 15);
 				return true;
 			}
 			case "admin_critannounce":
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
index 97bd70b6d9..08da9d401b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditChar.java
@@ -903,7 +903,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		return false;
 	}
 	
-	private void listCharacters(PlayerInstance activeChar, int page)
+	private void listCharacters(PlayerInstance activeChar, int pageValue)
 	{
 		final List<PlayerInstance> onlinePlayersList = new ArrayList<>();
 		for (PlayerInstance actualPlayer : World.getInstance().getAllPlayers())
@@ -927,6 +927,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		}
 		
 		// Check if number of users changed
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
@@ -1343,8 +1344,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		}
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
index 5b21cd19dc..54fb8ed15d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
@@ -1210,8 +1210,9 @@ public class AdminEditNpc implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void updateDropData(PlayerInstance activeChar, int npcId, int itemId, int min, int max, int category, int chance)
+	private void updateDropData(PlayerInstance activeChar, int npcIdValue, int itemId, int min, int max, int category, int chance)
 	{
+		int npcId = npcIdValue;
 		try (Connection con = DatabaseFactory.getConnection())
 		{
 			final PreparedStatement statement = con.prepareStatement("UPDATE droplist SET min=?, max=?, chance=? WHERE mobId=? AND itemId=? AND category=?");
@@ -1363,7 +1364,7 @@ public class AdminEditNpc implements IAdminCommandHandler
 		}
 	}
 	
-	private void showNpcSkillList(PlayerInstance activeChar, int npcId, int page)
+	private void showNpcSkillList(PlayerInstance activeChar, int npcId, int pageValue)
 	{
 		final NpcTemplate npcData = NpcTable.getInstance().getTemplate(npcId);
 		if (npcData == null)
@@ -1381,6 +1382,7 @@ public class AdminEditNpc implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
index ae54786b99..7389424711 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
@@ -184,10 +184,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.length() == 0)
+		if (trimmedParams.length() == 0)
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -202,7 +202,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 			int mid1 = 0;
 			int mid2 = 0;
 			
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(IdFactory.getNextId(), NpcTable.getInstance().getTemplate(mid1));
@@ -345,7 +345,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		replyMSG.append("<body>");
 		replyMSG.append("<table>");
 		
-		if (params.length() == 0)
+		if (trimmedParams.length() == 0)
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -388,7 +388,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		replyMSG.append("</table>");
 		replyMSG.append("<center><br>");
 		
-		if (params.length() == 0)
+		if (trimmedParams.length() == 0)
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\">");
 		}
@@ -402,7 +402,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			((MonsterInstance) npc1).deleteMe();
 			((MonsterInstance) npc2).deleteMe();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFortSiege.java
index bd9f3ed77e..e659df888e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFortSiege.java
@@ -52,8 +52,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminManor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminManor.java
index d001da7890..b891f77244 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminManor.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminManor.java
@@ -46,8 +46,9 @@ public class AdminManor implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		command = st.nextToken();
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
index 90a230746e..9a645aa79b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSiege.java
@@ -64,8 +64,9 @@ public class AdminSiege implements IAdminCommandHandler
 	
 	@SuppressWarnings("null")
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
index 256f128693..037b169a9f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
@@ -232,7 +232,7 @@ public class AdminSkill implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		// TODO: Externalize HTML
 		final WorldObject target = activeChar.getTarget();
@@ -255,6 +255,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
index a6c2574a2c..02c85f830b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
@@ -260,7 +260,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanent)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -273,6 +273,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
index 5cf5f6ae94..f1e21b50e8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
@@ -65,7 +65,7 @@ public class Continuous implements ISkillHandler
 	};
 	
 	@Override
-	public void useSkill(Creature creature, Skill skill2, WorldObject[] targets)
+	public void useSkill(Creature creature, Skill skillValue, WorldObject[] targets)
 	{
 		if (creature == null)
 		{
@@ -78,10 +78,11 @@ public class Continuous implements ISkillHandler
 			player = (PlayerInstance) creature;
 		}
 		
-		if (skill2.getEffectId() != 0)
+		Skill usedSkill = skillValue;
+		if (usedSkill.getEffectId() != 0)
 		{
-			final int skillLevel = skill2.getEffectLvl();
-			final int skillEffectId = skill2.getEffectId();
+			final int skillLevel = usedSkill.getEffectLvl();
+			final int skillEffectId = usedSkill.getEffectId();
 			Skill skill;
 			if (skillLevel == 0)
 			{
@@ -94,11 +95,11 @@ public class Continuous implements ISkillHandler
 			
 			if (skill != null)
 			{
-				skill2 = skill;
+				usedSkill = skill;
 			}
 		}
 		
-		final Skill skill = skill2;
+		final Skill skill = usedSkill;
 		final boolean bss = creature.checkBss();
 		final boolean sps = creature.checkSps();
 		final boolean ss = creature.checkSs();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
index 2af0d3450c..1678125085 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
@@ -1525,9 +1525,10 @@ public class FourSepulchersManager extends GrandBossManager
 		}
 	}
 	
-	protected byte minuteSelect(byte min)
+	protected byte minuteSelect(byte value)
 	{
-		if ((min % 5) != 0)// if doesn't divides on 5 fully
+		byte min = value;
+		if ((min % 5) != 0) // if doesn't divides on 5 fully
 		{
 			// mad table for selecting proper minutes...
 			// may be there is a better way to do this
@@ -1624,17 +1625,17 @@ public class FourSepulchersManager extends GrandBossManager
 		return min;
 	}
 	
-	public void managerSay(byte min)
+	public void managerSay(byte value)
 	{
 		// for attack phase, sending message every 5 minutes
 		if (_inAttackTime)
 		{
-			if (min < 5)
+			if (value < 5)
 			{
 				return; // do not shout when < 5 minutes
 			}
 			
-			min = minuteSelect(min);
+			final byte min = minuteSelect(value);
 			String msg = min + " minute(s) have passed.";
 			if (min == 90)
 			{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java
index 8df352fd35..7d5e3a0fe2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java
@@ -88,13 +88,12 @@ public class PetitionManager
 		
 		public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 		{
-			petitionType--;
 			_id = IdFactory.getNextId();
-			if (petitionType >= PetitionType.values().length)
+			if ((petitionType - 1) >= PetitionType.values().length)
 			{
 				LOGGER.warning("PetitionManager:Petition : invalid petition type (received type was +1) : " + petitionType);
 			}
-			_type = PetitionType.values()[petitionType];
+			_type = PetitionType.values()[petitionType - 1];
 			_content = petitionText;
 			_petitioner = petitioner;
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
index d548478db8..0078c8b514 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -226,6 +226,7 @@ public class RaidBossSpawnManager
 			return;
 		}
 		
+		double hp = currentHP;
 		final int bossId = spawnDat.getNpcId();
 		final long time = Calendar.getInstance().getTimeInMillis();
 		SpawnTable.getInstance().addNewSpawn(spawnDat, false);
@@ -237,19 +238,19 @@ public class RaidBossSpawnManager
 				final double bonus = raidboss.getStat().calcStat(Stat.MAX_HP, 1, raidboss, null);
 				
 				// if new spawn, the currentHp is equal to maxHP/bonus, so set it to max
-				if ((int) (bonus * currentHP) == raidboss.getMaxHp())
+				if ((int) (bonus * hp) == raidboss.getMaxHp())
 				{
-					currentHP = (raidboss.getMaxHp());
+					hp = (raidboss.getMaxHp());
 				}
 				
-				raidboss.setCurrentHp(currentHP);
+				raidboss.setCurrentHp(hp);
 				raidboss.setCurrentMp(currentMP);
 				raidboss.setRaidStatus(RaidBossStatus.ALIVE);
 				
 				_bosses.put(bossId, raidboss);
 				
 				final StatSet info = new StatSet();
-				info.set("currentHP", currentHP);
+				info.set("currentHP", hp);
 				info.set("currentMP", currentMP);
 				info.set("respawnTime", 0);
 				_storedInfo.put(bossId, info);
@@ -277,7 +278,7 @@ public class RaidBossSpawnManager
 				statement.setInt(5, spawnDat.getZ());
 				statement.setInt(6, spawnDat.getHeading());
 				statement.setLong(7, respawnTime);
-				statement.setDouble(8, currentHP);
+				statement.setDouble(8, hp);
 				statement.setDouble(9, currentMP);
 				statement.execute();
 			}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java
index 11f8c677da..ed233bdde2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ChanceSkillList.java
@@ -145,28 +145,29 @@ public class ChanceSkillList extends ConcurrentHashMap<Skill, ChanceCondition>
 		{
 			if (skill.calcWeaponDependancy(_owner))
 			{
-				if (skill.triggerAnotherSkill()) // should we use this skill or this skill is just referring to another one ...
+				Skill castedSkill = skill;
+				if (castedSkill.triggerAnotherSkill()) // should we use this skill or this skill is just referring to another one ...
 				{
-					skill = _owner.getSkills().get(skill.getTriggeredId());
-					if (skill == null)
+					castedSkill = _owner.getSkills().get(castedSkill.getTriggeredId());
+					if (castedSkill == null)
 					{
 						return;
 					}
 				}
 				
-				final ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
-				final WorldObject[] targets = skill.getTargetList(_owner, false, target);
-				_owner.broadcastPacket(new MagicSkillLaunched(_owner, skill.getDisplayId(), skill.getLevel(), targets));
-				_owner.broadcastPacket(new MagicSkillUse(_owner, (Creature) targets[0], skill.getDisplayId(), skill.getLevel(), 0, 0));
+				final ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(castedSkill.getSkillType());
+				final WorldObject[] targets = castedSkill.getTargetList(_owner, false, target);
+				_owner.broadcastPacket(new MagicSkillLaunched(_owner, castedSkill.getDisplayId(), castedSkill.getLevel(), targets));
+				_owner.broadcastPacket(new MagicSkillUse(_owner, (Creature) targets[0], castedSkill.getDisplayId(), castedSkill.getLevel(), 0, 0));
 				
 				// Launch the magic skill and calculate its effects
 				if (handler != null)
 				{
-					handler.useSkill(_owner, skill, targets);
+					handler.useSkill(_owner, castedSkill, targets);
 				}
 				else
 				{
-					skill.useSkill(_owner, targets);
+					castedSkill.useSkill(_owner, targets);
 				}
 			}
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ObjectPosition.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ObjectPosition.java
index b0220bf312..39e741f6f1 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ObjectPosition.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ObjectPosition.java
@@ -98,27 +98,27 @@ public class ObjectPosition
 	 */
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
+		}
+		if (correctX < World.MAP_MIN_X)
+		{
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		if (x < World.MAP_MIN_X)
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
 		{
-			x = World.MAP_MIN_X + 5000;
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
 		}
 		
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
-		}
-		
-		setWorldPosition(x, y, z);
+		setWorldPosition(correctX, correctY, z);
 		_activeObject.setVisible(false);
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
index e7ec3b8454..be95d9329c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
@@ -184,20 +184,21 @@ public class Party
 	 */
 	private PlayerInstance getCheckedNextLooter(int itemId, Creature target)
 	{
-		for (int i = 0; i < _members.size(); i++)
+		for (@SuppressWarnings("unused")
+		PlayerInstance member : _members)
 		{
 			if (++_itemLastLoot >= _members.size())
 			{
 				_itemLastLoot = 0;
 			}
 			
-			PlayerInstance member;
+			PlayerInstance player;
 			try
 			{
-				member = _members.get(_itemLastLoot);
-				if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, member, true))
+				player = _members.get(_itemLastLoot);
+				if (player.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, target, player, true))
 				{
-					return member;
+					return player;
 				}
 			}
 			catch (Exception e)
@@ -691,20 +692,20 @@ public class Party
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T GIVE rewards to PetInstance</b></font><br>
 	 * Exception are PetInstances that leech from the owner's XP; they get the exp indirectly, via the owner's exp gain
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 */
-	public void distributeXpAndSp(long xpReward, int spReward, List<Playable> rewardedMembers, int topLvl)
+	public void distributeXpAndSp(long xpRewardValue, int spRewardValue, List<Playable> rewardedMembers, int topLvl)
 	{
 		SummonInstance summon = null;
 		final List<Playable> validMembers = getValidMembers(rewardedMembers, topLvl);
 		float penalty;
 		double sqLevel;
 		double preCalculation;
-		xpReward *= getExpBonus(validMembers.size());
-		spReward *= getSpBonus(validMembers.size());
+		int xpReward = (int) (xpRewardValue * getExpBonus(validMembers.size()));
+		int spReward = (int) (spRewardValue * getSpBonus(validMembers.size()));
 		double sqLevelSum = 0;
 		for (Playable character : validMembers)
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
index d17b0fd5d9..8a533e8097 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
@@ -1406,10 +1406,10 @@ public abstract class Skill
 	 * <li>ITEM</li><br>
 	 * @param creature The Creature who use the skill
 	 * @param onlyFirst
-	 * @param target
+	 * @param targetCreature
 	 * @return
 	 */
-	public WorldObject[] getTargetList(Creature creature, boolean onlyFirst, Creature target)
+	public WorldObject[] getTargetList(Creature creature, boolean onlyFirst, Creature targetCreature)
 	{
 		// to avoid attacks during oly start period
 		if ((creature instanceof PlayerInstance) && _isOffensive && (((PlayerInstance) creature).isInOlympiadMode() && !((PlayerInstance) creature).isOlympiadStart()))
@@ -1427,6 +1427,7 @@ public abstract class Skill
 			};
 		}
 		
+		Creature target = targetCreature;
 		switch (_targetType)
 		{
 			// The skill can only be used on the Creature targeted, or on the caster itself
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java
index 8c0c47b782..1c69130ba8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java
@@ -69,11 +69,11 @@ public class StoreTradeList
 		_items.add(item);
 	}
 	
-	public void replaceItem(int itemID, int price)
+	public void replaceItem(int itemID, int priceValue)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		int price = priceValue;
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getItemId() == itemID)
 			{
 				if (price < (item.getReferencePrice() / 2))
@@ -88,9 +88,8 @@ public class StoreTradeList
 	
 	public synchronized boolean decreaseCount(int itemID, int count)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getItemId() == itemID)
 			{
 				if (item.getCount() < count)
@@ -105,9 +104,8 @@ public class StoreTradeList
 	
 	public void restoreCount(int time)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getCountDecrease() && (item.getTime() == time))
 			{
 				item.restoreInitCount();
@@ -170,9 +168,8 @@ public class StoreTradeList
 	
 	public int getPriceForItemId(int itemId)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getItemId() == itemId)
 			{
 				return item.getPriceToSell();
@@ -183,9 +180,8 @@ public class StoreTradeList
 	
 	public boolean countDecrease(int itemId)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getItemId() == itemId)
 			{
 				return item.getCountDecrease();
@@ -208,9 +204,8 @@ public class StoreTradeList
 	
 	public ItemInstance getItem(int objectId)
 	{
-		for (int i = 0; i < _items.size(); i++)
+		for (final ItemInstance item : _items)
 		{
-			final ItemInstance item = _items.get(i);
 			if (item.getObjectId() == objectId)
 			{
 				return item;
@@ -250,9 +245,9 @@ public class StoreTradeList
 	{
 		boolean bool = false;
 		ItemInstance temp;
-		for (int y = 0; y < _items.size(); y++)
+		for (ItemInstance _item : _items)
 		{
-			temp = _items.get(y);
+			temp = _item;
 			if (temp.getObjectId() == objId)
 			{
 				bool = true;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
index b7fc05c6e1..455f97d141 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -242,24 +242,28 @@ public abstract class WorldObject
 		{
 			// Set the x,y,z position of the WorldObject spawn and update its _worldregion
 			_visible = true;
-			if (x > World.MAP_MAX_X)
+			
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
-			}
-			if (y > World.MAP_MAX_Y)
-			{
-				y = World.MAP_MAX_Y - 5000;
-			}
-			if (y < World.MAP_MIN_Y)
-			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
 			
-			getPosition().setWorldPosition(x, y, z);
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
+			{
+				spawnY = World.MAP_MAX_Y - 5000;
+			}
+			if (spawnY < World.MAP_MIN_Y)
+			{
+				spawnY = World.MAP_MIN_Y + 5000;
+			}
+			
+			getPosition().setWorldPosition(spawnX, spawnY, z);
 			getPosition().setWorldRegion(World.getInstance().getRegion(getPosition().getWorldPosition()));
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 6fd4a1c6bd..0edc57ffa4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -934,9 +934,9 @@ public class Attackable extends NpcInstance
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
 	 * @param attacker The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature attacker, int damage, int aggroValue)
 	{
 		if (attacker == null)
 		{
@@ -954,6 +954,7 @@ public class Attackable extends NpcInstance
 		}
 		
 		// If aggro is negative, its comming from SEE_SPELL, buffs use constant 150
+		int aggro = aggroValue;
 		if (aggro < 0)
 		{
 			ai._hate -= (aggro * 150) / (getLevel() + 7);
@@ -1015,6 +1016,7 @@ public class Attackable extends NpcInstance
 			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null, null);
 			return;
 		}
+		
 		if (target == null) // whole aggrolist
 		{
 			final Creature mostHated = getMostHated();
@@ -1032,15 +1034,13 @@ public class Attackable extends NpcInstance
 				ai._hate -= amount;
 			}
 			
-			amount = getHating(mostHated);
-			if (amount <= 0)
+			if (getHating(mostHated) <= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
 				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 				setWalking();
 			}
-			
 			return;
 		}
 		
@@ -2847,14 +2847,15 @@ public class Attackable extends NpcInstance
 	
 	/**
 	 * Calculate the Experience and SP to distribute to attacker (PlayerInstance, SummonInstance or Party) of the Attackable.
-	 * @param diff The difference of level between attacker (PlayerInstance, SummonInstance or Party) and the Attackable
+	 * @param diffValue The difference of level between attacker (PlayerInstance, SummonInstance or Party) and the Attackable
 	 * @param damage The damages given by the attacker (PlayerInstance, SummonInstance or Party)
 	 * @return
 	 */
-	private int[] calculateExpAndSp(int diff, long damage)
+	private int[] calculateExpAndSp(int diffValue, long damage)
 	{
 		double xp;
 		double sp;
+		int diff = diffValue;
 		if (diff < -5)
 		{
 			diff = -5; // makes possible to use ALT_GAME_EXPONENT configuration
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 62e0f20a41..e8ec32e536 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -606,12 +606,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 * <li>Set the x,y,z position of the WorldObject and if necessary modify its _worldRegion</li>
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li><br>
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
+	 * @param xValue the x
+	 * @param yValue the y
+	 * @param zValue the z
 	 * @param allowRandomOffset the allow random offset
 	 */
-	public void teleToLocation(int x, int y, int z, boolean allowRandomOffset)
+	public void teleToLocation(int xValue, int yValue, int zValue, boolean allowRandomOffset)
 	{
 		if (Config.TW_DISABLE_GK)
 		{
@@ -646,12 +646,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		
 		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
 		if (Config.RESPAWN_RANDOM_ENABLED && allowRandomOffset)
 		{
 			x += Rnd.get(-Config.RESPAWN_RANDOM_MAX_OFFSET, Config.RESPAWN_RANDOM_MAX_OFFSET);
 			y += Rnd.get(-Config.RESPAWN_RANDOM_MAX_OFFSET, Config.RESPAWN_RANDOM_MAX_OFFSET);
 		}
-		
 		z += 5;
 		
 		// Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in the _KnownPlayers of the Creature
@@ -2836,17 +2838,18 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 */
 	public void setTitle(String value)
 	{
-		if (value == null)
+		String title = value;
+		if (title == null)
 		{
-			value = "";
+			title = "";
 		}
 		
-		if ((this instanceof PlayerInstance) && (value.length() > 16))
+		if ((this instanceof PlayerInstance) && (title.length() > 16))
 		{
-			value = value.substring(0, 15);
+			title = title.substring(0, 15);
 		}
 		
-		_title = value; // public void setTitle(String value) { _title = value; }
+		_title = title;
 	}
 	
 	/**
@@ -5403,10 +5406,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 * <b><u>Overriden in</u>:</b><br>
 	 * <br>
 	 * <li>PlayerInstance : Remove the PlayerInstance from the old target _statusListener and add it to the new target if it was a Creature</li><br>
-	 * @param object L2object to target
+	 * @param worldObject WorldObject to target
 	 */
-	public void setTarget(WorldObject object)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject object = worldObject;
 		if ((object != null) && !object.isVisible())
 		{
 			object = null;
@@ -5487,12 +5491,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 * <b><u>Example of use</u>:</b><br>
 	 * <li>AI : onIntentionMoveTo(L2CharPosition), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li><br>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	protected void moveToLocation(int x, int y, int z, int offset)
+	protected void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Block movement during Event start
 		if (this instanceof PlayerInstance)
@@ -5534,6 +5538,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -6143,13 +6152,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 	 * <li>If attack isn't aborted and hit isn't missed, reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary</li>
 	 * <li>if attack isn't aborted and hit isn't missed, manage attack or cast break of the target (calculating rate, sending message...)</li><br>
 	 * @param target The Creature targeted
-	 * @param damage number of HP to reduce
+	 * @param damageValue number of HP to reduce
 	 * @param crit True if hit is critical
 	 * @param miss True if hit is missed
 	 * @param soulshot True if SoulShot are charged
 	 * @param shld True if shield is efficient
 	 */
-	protected void onHitTimer(Creature target, int damage, boolean crit, boolean miss, boolean soulshot, boolean shld)
+	protected void onHitTimer(Creature target, int damageValue, boolean crit, boolean miss, boolean soulshot, boolean shld)
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
@@ -6187,6 +6196,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
 		// If attack isn't aborted, send a message system (critical hit, missed...) to attacker/target if they are PlayerInstance
 		if (!isAttackAborted())
 		{
+			int damage = damageValue;
 			if (Config.ALLOW_RAID_BOSS_PETRIFIED && ((this instanceof PlayerInstance) || (this instanceof Summon))) // Check if option is True Or False.
 			{
 				boolean toBeCursed = false;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
index d213c2a403..a6378c1e99 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
@@ -436,11 +436,7 @@ public abstract class Summon extends Playable
 	
 	public void setAttackRange(int range)
 	{
-		if (range < 36)
-		{
-			range = 36;
-		}
-		_attackRange = range;
+		_attackRange = Math.max(36, range);
 	}
 	
 	public void setFollowStatus(boolean value)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java
index 19d01519c8..8f2561949b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java
@@ -91,7 +91,7 @@ public class ControllableMobInstance extends MonsterInstance
 	}
 	
 	@Override
-	public void reduceCurrentHp(double i, Creature attacker, boolean awake)
+	public void reduceCurrentHp(double value, Creature attacker, boolean awake)
 	{
 		if (_isInvul || isDead())
 		{
@@ -103,13 +103,7 @@ public class ControllableMobInstance extends MonsterInstance
 			stopSleeping(null);
 		}
 		
-		i = getCurrentHp() - i;
-		if (i < 0)
-		{
-			i = 0;
-		}
-		
-		setCurrentHp(i);
+		setCurrentHp(Math.max(0, getCurrentHp() - value));
 		
 		if (isDead())
 		{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java
index 9936acd5d6..00624997a8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GourdInstance.java
@@ -63,8 +63,9 @@ public class GourdInstance extends MonsterInstance
 	}
 	
 	@Override
-	public void reduceCurrentHp(double damage, Creature attacker, boolean awake)
+	public void reduceCurrentHp(double damageValue, Creature attacker, boolean awake)
 	{
+		double damage = damageValue;
 		if (!attacker.getName().equalsIgnoreCase(_name))
 		{
 			damage = 0;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
index 6e55c28ec6..06b88f0a8f 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
@@ -218,9 +218,9 @@ public class MerchantInstance extends FolkInstance
 	/**
 	 * Try rent pet.
 	 * @param player the player
-	 * @param value the value
+	 * @param val the value
 	 */
-	public void tryRentPet(PlayerInstance player, int value)
+	public void tryRentPet(PlayerInstance player, int val)
 	{
 		if ((player == null) || (player.getPet() != null) || player.isMounted() || player.isRentedPet())
 		{
@@ -248,6 +248,7 @@ public class MerchantInstance extends FolkInstance
 			1800
 		};
 		
+		int value = val;
 		if (value > 10)
 		{
 			petId = 12526;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index e54d4d2b0d..0c4c32c4f7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -1626,9 +1626,8 @@ public class NpcInstance extends Creature
 	public void insertObjectIdAndShowChatWindow(PlayerInstance player, String content)
 	{
 		// Send a Server->Client packet NpcHtmlMessage to the PlayerInstance in order to display the message of the NpcInstance
-		content = content.replace("%objectId%", String.valueOf(getObjectId()));
 		final NpcHtmlMessage npcReply = new NpcHtmlMessage(getObjectId());
-		npcReply.setHtml(content);
+		npcReply.setHtml(content.replace("%objectId%", String.valueOf(getObjectId())));
 		player.sendPacket(npcReply);
 	}
 	
@@ -1785,9 +1784,8 @@ public class NpcInstance extends Creature
 				return;
 			}
 			
-			questId = qs.getQuest().getName();
 			final String stateId = State.getStateName(qs.getState());
-			final String path = Config.DATAPACK_ROOT + "/data/scripts/quests/" + questId + "/" + stateId + ".htm";
+			final String path = Config.DATAPACK_ROOT + "/data/scripts/quests/" + qs.getQuest().getName() + "/" + stateId + ".htm";
 			content = HtmCache.getInstance().getHtm(path);
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 6fb8f1bcfa..4017400d68 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -786,12 +786,12 @@ public class PetInstance extends Summon
 	
 	/**
 	 * Drop item here.
-	 * @param dropit the dropit
+	 * @param item the dropit
 	 * @param protect the protect
 	 */
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3053595486..4a0e9be1f1 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1531,12 +1531,13 @@ public class PlayerInstance extends Playable
 	/**
 	 * Process quest event.
 	 * @param quest the quest
-	 * @param event the event
+	 * @param eventValue the event
 	 * @return the quest state
 	 */
-	public QuestState processQuestEvent(String quest, String event)
+	public QuestState processQuestEvent(String quest, String eventValue)
 	{
 		QuestState retval = null;
+		String event = eventValue;
 		if (event == null)
 		{
 			event = "";
@@ -2055,10 +2056,11 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the Karma of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param karma the new karma
+	 * @param value the new karma
 	 */
-	public void setKarma(int karma)
+	public void setKarma(int value)
 	{
+		int karma = value;
 		if (karma < 0)
 		{
 			karma = 0;
@@ -3345,12 +3347,13 @@ public class PlayerInstance extends Playable
 	/**
 	 * Add adena to Inventory of the PlayerInstance and send a Server->Client InventoryUpdate packet to the PlayerInstance.
 	 * @param process : String Identifier of process triggering this action
-	 * @param count : int Quantity of adena to be added
+	 * @param amount : int Quantity of adena to be added
 	 * @param reference : WorldObject Object referencing current action like NPC selling item or previous item in transformation
 	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
 	 */
-	public void addAdena(String process, int count, WorldObject reference, boolean sendMessage)
+	public void addAdena(String process, int amount, WorldObject reference, boolean sendMessage)
 	{
+		int count = amount;
 		if (count > 0)
 		{
 			if (_inventory.getAdena() == Integer.MAX_VALUE)
@@ -3717,8 +3720,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3731,7 +3734,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -3750,14 +3753,14 @@ public class PlayerInstance extends Playable
 			if (_count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(destoyedItem.getItemId());
 				sm.addNumber(_count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
-				sm.addItemName(item.getItemId());
+				sm.addItemName(destoyedItem.getItemId());
 				sendPacket(sm);
 			}
 		}
@@ -4109,8 +4112,8 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -4119,41 +4122,41 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getClientX() + Rnd.get(50)) - 25, (getClientY() + Rnd.get(50)) - 25, getClientZ() + 20);
-		if (Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getItemId()))
+		droppedItem.dropMe(this, (getClientX() + Rnd.get(50)) - 25, (getClientY() + Rnd.get(50)) - 25, getClientZ() + 20);
+		if (Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getItemId()))
 		{
 			if (Config.AUTODESTROY_ITEM_AFTER > 0) // autodestroy enabled
 			{
-				if ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable())
+				if ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable())
 				{
-					ItemsAutoDestroy.getInstance().addItem(item);
-					item.setProtected(false);
+					ItemsAutoDestroy.getInstance().addItem(droppedItem);
+					droppedItem.setProtected(false);
 				}
 				else
 				{
-					item.setProtected(true);
+					droppedItem.setProtected(true);
 				}
 			}
 			else
 			{
-				item.setProtected(true);
+				droppedItem.setProtected(true);
 			}
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -4170,7 +4173,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item.getItemId());
+			sm.addItemName(droppedItem.getItemId());
 			sendPacket(sm);
 		}
 		
@@ -5434,12 +5437,13 @@ public class PlayerInstance extends Playable
 	 * <li>Remove the PlayerInstance from the _statusListener of the old target if it was a Creature</li>
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li><br>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
 		// Check if the new target is visible
+		WorldObject newTarget = worldObject;
 		if ((newTarget != null) && !newTarget.isVisible())
 		{
 			newTarget = null;
@@ -9527,21 +9531,19 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		slot--;
-		
-		if (_henna[slot] == null)
+		if (_henna[slot - 1] == null)
 		{
 			return false;
 		}
 		
-		Henna henna = _henna[slot];
-		_henna[slot] = null;
+		Henna henna = _henna[slot - 1];
+		_henna[slot - 1] = null;
 		
 		try (Connection con = DatabaseFactory.getConnection())
 		{
 			PreparedStatement statement = con.prepareStatement(DELETE_CHAR_HENNA);
 			statement.setInt(1, getObjectId());
-			statement.setInt(2, slot + 1);
+			statement.setInt(2, slot);
 			statement.setInt(3, getClassIndex());
 			statement.execute();
 			statement.close();
@@ -10555,13 +10557,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Check if the requested casting is a Pc->Pc skill cast and if it's a valid pvp condition.
-	 * @param target WorldObject instance containing the target
+	 * @param worldObject WorldObject instance containing the target
 	 * @param skill Skill instance with the skill being casted
 	 * @param srcIsSummon is Summon - caster?
 	 * @return False if the skill is a pvpSkill and target is not a valid pvp target
 	 */
-	public boolean checkPvpSkill(WorldObject target, Skill skill, boolean srcIsSummon)
+	public boolean checkPvpSkill(WorldObject worldObject, Skill skill, boolean srcIsSummon)
 	{
+		WorldObject target = worldObject;
+		
 		// Check if player and target are in events and on the same team.
 		if (target instanceof PlayerInstance)
 		{
@@ -15315,11 +15319,12 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * String to hex.
-	 * @param color the color
+	 * @param value the color
 	 * @return the string
 	 */
-	private String StringToHex(String color)
+	private String StringToHex(String value)
 	{
+		String color = value;
 		switch (color.length())
 		{
 			case 1:
@@ -15825,10 +15830,11 @@ public class PlayerInstance extends Playable
 	/**
 	 * Sets the end time.
 	 * @param process the process
-	 * @param value the value
+	 * @param time the value
 	 */
-	public void setEndTime(String process, int value)
+	public void setEndTime(String process, int time)
 	{
+		int value = time;
 		if (value > 0)
 		{
 			long endDay;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index 4a62f3667a..13f26c57b2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -41,10 +41,10 @@ public class SchemeBufferInstance extends FolkInstance
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -283,10 +283,10 @@ public class SchemeBufferInstance extends FolkInstance
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -297,6 +297,7 @@ public class SchemeBufferInstance extends FolkInstance
 		
 		// Calculate page number.
 		final int max = Util.countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
index 6bce9a8e3a..44ea52179b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
@@ -228,11 +228,12 @@ public class SepulcherNpcInstance extends NpcInstance
 			{
 				setInvul(false);
 				reduceCurrentHp(getMaxHp() + 1, player);
+				PlayerInstance leader = player;
 				if ((player.getParty() != null) && !player.getParty().isLeader(player))
 				{
-					player = player.getParty().getLeader();
+					leader = player.getParty().getLeader();
 				}
-				player.addItem("Quest", HALLS_KEY, 1, player, true);
+				leader.addItem("Quest", HALLS_KEY, 1, leader, true);
 				break;
 			}
 			default:
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 5a6dece2cb..b3b4fbc883 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -30,13 +30,14 @@ public class PlayableStat extends CreatureStat
 		super(activeChar);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(ExperienceData.getInstance().getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(ExperienceData.getInstance().getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(ExperienceData.getInstance().getMaxLevel()))
 		{
 			value = getExpForLevel(ExperienceData.getInstance().getMaxLevel()) - 1 - getExp();
@@ -62,8 +63,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if ((getExp() - value) < 0)
 		{
 			value = getExp() - 1;
@@ -124,8 +126,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
 			if (getLevel() < (ExperienceData.getInstance().getMaxLevel() - 1))
@@ -159,9 +162,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(int value)
+	public boolean addSp(int amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.info("wrong usage");
 			return false;
@@ -173,6 +176,7 @@ public class PlayableStat extends CreatureStat
 			return false;
 		}
 		
+		int value = amount;
 		if (currentSp > (Integer.MAX_VALUE - value))
 		{
 			value = Integer.MAX_VALUE - currentSp;
@@ -182,15 +186,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(int value)
+	public boolean removeSp(int amount)
 	{
 		final int currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 701fa05e32..11bfb7ed49 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -87,11 +87,11 @@ public class PlayerStat extends PlayableStat
 	 * <li>If the PlayerInstance increases it's level, send a Server->Client packet SocialAction (broadcast)</li>
 	 * <li>If the PlayerInstance increases it's level, manage the increase level task (Max MP, Max MP, Recommendation, Expertise and beginner skills...)</li>
 	 * <li>If the PlayerInstance increases it's level, send a Server->Client packet UserInfo to the PlayerInstance</li><br>
-	 * @param addToExp The Experience value to add
-	 * @param addToSp The SP value to add
+	 * @param addToExpValue The Experience value to add
+	 * @param addToSpValue The SP value to add
 	 */
 	@Override
-	public boolean addExpAndSp(long addToExp, int addToSp)
+	public boolean addExpAndSp(long addToExpValue, int addToSpValue)
 	{
 		float ratioTakenByPet = 0;
 		
@@ -102,6 +102,9 @@ public class PlayerStat extends PlayableStat
 			return false;
 		}
 		
+		long addToExp = addToExpValue;
+		int addToSp = addToSpValue;
+		
 		// if this player has a pet that takes from the owner's Exp, give the pet Exp now
 		if (player.getPet() instanceof PetInstance)
 		{
@@ -333,9 +336,10 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(int value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		int level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = ExperienceData.getInstance().getMaxLevel() - 1;
+			level = ExperienceData.getInstance().getMaxLevel() - 1;
 		}
 		
 		final PlayerInstance player = getActiveChar();
@@ -344,12 +348,12 @@ public class PlayerStat extends PlayableStat
 			final SubClass playerSubclass = player.getSubClasses().get(player.getClassIndex());
 			if (playerSubclass != null)
 			{
-				playerSubclass.setLevel(value);
+				playerSubclass.setLevel(level);
 			}
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
index 8db4fd446d..28c67e8f68 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/CreatureStatus.java
@@ -116,17 +116,18 @@ public class CreatureStatus
 	
 	/**
 	 * Reduce hp.
-	 * @param value the value
+	 * @param amount the value
 	 * @param attacker the attacker
 	 * @param awake the awake
 	 */
-	public void reduceHp(double value, Creature attacker, boolean awake)
+	public void reduceHp(double amount, Creature attacker, boolean awake)
 	{
 		if (_creature.isInvul())
 		{
 			return;
 		}
 		
+		double value = amount;
 		if (_creature instanceof PlayerInstance)
 		{
 			if (((PlayerInstance) _creature).isInDuel())
@@ -256,17 +257,11 @@ public class CreatureStatus
 	
 	/**
 	 * Reduce mp.
-	 * @param value the value
+	 * @param amount the value
 	 */
-	public void reduceMp(double value)
+	public void reduceMp(double amount)
 	{
-		value = _currentMp - value;
-		if (value < 0)
-		{
-			value = 0;
-		}
-		
-		setCurrentMp(value);
+		setCurrentMp(Math.max(0, _currentMp - amount));
 	}
 	
 	/**
@@ -376,21 +371,18 @@ public class CreatureStatus
 	
 	/**
 	 * Sets the current cp.
-	 * @param newCp the new cp
+	 * @param value the new cp
 	 * @param broadcastPacket the broadcast packet
 	 * @param direct the direct
 	 */
-	public void setCurrentCp(double newCp, boolean broadcastPacket, boolean direct)
+	public void setCurrentCp(double value, boolean broadcastPacket, boolean direct)
 	{
 		synchronized (this)
 		{
 			// Get the Max CP of the Creature
 			final int maxCp = _creature.getStat().getMaxCp();
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
 			
+			final double newCp = Math.max(0, value);
 			if ((newCp >= maxCp) && !direct)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 8b42328171..06a553d64b 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -42,7 +42,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake)
+	public void reduceHp(double amount, Creature attacker, boolean awake)
 	{
 		if (getActiveChar().isInvul() && (getActiveChar() != attacker))
 		{
@@ -89,7 +89,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double value = amount;
+		int fullValue = (int) amount;
 		if ((attacker != null) && (attacker != getActiveChar()))
 		{
 			// Check and calculate transfered damage
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
index cac9474ac7..b4d65baaf7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -92,9 +92,9 @@ public class SubClass
 	{
 		if (expValue > ExperienceData.getInstance().getExpForLevel(Config.MAX_SUBCLASS_LEVEL))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(Config.MAX_SUBCLASS_LEVEL);
+			_exp = ExperienceData.getInstance().getExpForLevel(Config.MAX_SUBCLASS_LEVEL);
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -112,13 +112,14 @@ public class SubClass
 	{
 		if (levelValue > (Config.MAX_SUBCLASS_LEVEL - 1))
 		{
-			levelValue = Config.MAX_SUBCLASS_LEVEL - 1;
+			_level = Config.MAX_SUBCLASS_LEVEL - 1;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
index e1024f8ece..a7a1af7e59 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -854,8 +854,9 @@ public class Clan
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -919,8 +920,10 @@ public class Clan
 		return (_introduction == null) ? "" : _introduction;
 	}
 	
-	public void setIntroduction(String intro, boolean saveOnDb)
+	public void setIntroduction(String value, boolean saveOnDb)
 	{
+		String intro = value;
+		
 		if (saveOnDb)
 		{
 			if (intro == null)
@@ -1426,10 +1429,10 @@ public class Clan
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, String leaderName, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, String leaderName, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1505,8 +1508,7 @@ public class Clan
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1514,18 +1516,15 @@ public class Clan
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Auction.java
index efb118382b..c323fe5940 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Auction.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Auction.java
@@ -342,15 +342,16 @@ public class Auction
 	 */
 	private void returnItem(String clan, int quantity, boolean penalty)
 	{
+		int amount = quantity;
 		if (penalty)
 		{
-			quantity *= 0.9; // take 10% tax fee if needed
+			amount *= 0.9; // take 10% tax fee if needed
 		}
 		
 		// avoid overflow on return
 		final long limit = MAX_ADENA - ClanTable.getInstance().getClanByName(clan).getWarehouse().getAdena();
-		quantity = (int) Math.min(quantity, limit);
-		ClanTable.getInstance().getClanByName(clan).getWarehouse().addItem("Outbidded", ADENA_ID, quantity, null, null);
+		amount = (int) Math.min(amount, limit);
+		ClanTable.getInstance().getClanByName(clan).getWarehouse().addItem("Outbidded", ADENA_ID, amount, null, null);
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/Lottery.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/Lottery.java
index b0be278606..37656dd0d9 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/Lottery.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/Lottery.java
@@ -397,12 +397,13 @@ public class Lottery
 		}
 	}
 	
-	public int[] decodeNumbers(int enchant, int type2)
+	public int[] decodeNumbers(int enchantValue, int type2Value)
 	{
 		final int[] res = new int[5];
 		int id = 0;
 		int nr = 1;
 		
+		int enchant = enchantValue;
 		while (enchant > 0)
 		{
 			final int val = enchant / 2;
@@ -417,6 +418,7 @@ public class Lottery
 		
 		nr = 17;
 		
+		int type2 = type2Value;
 		while (type2 > 0)
 		{
 			final int val = type2 / 2;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
index 134571e380..fdbdee2143 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
@@ -4387,10 +4387,10 @@ public class SevenSignsFestival implements SpawnListener
 		 * Returns the running instance of a festival for the given Oracle and festivalID.<br>
 		 * A <b>null</b> value is returned if there are no participants in that festival.
 		 * @param oracle the oracle
-		 * @param festivalId the festival id
+		 * @param festivalIdValue the festival id
 		 * @return DarknessFestival festivalInst
 		 */
-		public DarknessFestival getFestivalInstance(int oracle, int festivalId)
+		public DarknessFestival getFestivalInstance(int oracle, int festivalIdValue)
 		{
 			if (!_festivalInitialized)
 			{
@@ -4398,6 +4398,7 @@ public class SevenSignsFestival implements SpawnListener
 			}
 			
 			// Compute the offset if a Dusk instance is required. ID: 0 1 2 3 4 Dusk 1: 10 11 12 13 14 Dawn 2: 20 21 22 23 24
+			int festivalId = festivalIdValue;
 			festivalId += oracle == SevenSigns.CABAL_DUSK ? 10 : 20;
 			return _festivalInstances.get(festivalId);
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java
index 46cedba6aa..c854faf5df 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/Castle.java
@@ -134,15 +134,16 @@ public class Castle
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(int amount)
+	public void addToTreasury(int amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return;
 		}
 		
+		int amount = amountValue;
 		if (_name.equalsIgnoreCase("Schuttgart") || _name.equalsIgnoreCase("Goddard"))
 		{
 			final Castle rune = CastleManager.getInstance().getCastle("rune");
@@ -177,16 +178,17 @@ public class Castle
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(int amount)
+	public boolean addToTreasuryNoTax(int amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		int amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -218,6 +220,7 @@ public class Castle
 		{
 			LOGGER.warning(e.toString());
 		}
+		
 		return true;
 	}
 	
@@ -703,9 +706,8 @@ public class Castle
 			return null;
 		}
 		
-		for (int i = 0; i < _doors.size(); i++)
+		for (final DoorInstance door : _doors)
 		{
-			final DoorInstance door = _doors.get(i);
 			if (door.getDoorId() == doorId)
 			{
 				return door;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 52d74294e2..c483ce4ac5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -177,32 +177,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, WorldObject reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getItemId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getItemId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final int count = item.getCount();
+			final int count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setLocation(getBaseLocation());
-			item.setLastChange(ItemInstance.ADDED);
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setLocation(getBaseLocation());
+			newItem.setLastChange(ItemInstance.ADDED);
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -306,13 +307,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process : String Identifier of process triggering this action
 	 * @param objectId
-	 * @param count : int Quantity of items to be transfered
+	 * @param amount : int Quantity of items to be transfered
 	 * @param target
 	 * @param actor : PlayerInstance Player requesting the item transfer
 	 * @param reference : WorldObject Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, int count, ItemContainer target, PlayerInstance actor, WorldObject reference)
+	public ItemInstance transferItem(String process, int objectId, int amount, ItemContainer target, PlayerInstance actor, WorldObject reference)
 	{
 		if (target == null)
 		{
@@ -335,6 +336,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			int count = amount;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
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 2750717d1a..f0086795d6 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
@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.gameserver.model.TradeList;
-import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.TradeList.TradeItem;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -399,18 +399,19 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, WorldObject reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if ((item != null) && (item.getItemId() == ADENA_ID) && !item.equals(_adena))
+		ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		
+		if ((addedItem != null) && (addedItem.getItemId() == ADENA_ID) && !addedItem.equals(_adena))
 		{
-			_adena = item;
+			_adena = addedItem;
 		}
 		
-		if ((item != null) && (item.getItemId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+		if ((addedItem != null) && (addedItem.getItemId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 		{
-			_ancientAdena = item;
+			_ancientAdena = addedItem;
 		}
 		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -426,6 +427,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance addItem(String process, int itemId, int count, PlayerInstance actor, WorldObject reference)
 	{
 		final ItemInstance item = super.addItem(process, itemId, count, actor, reference);
+		
 		if ((item != null) && (item.getItemId() == ADENA_ID) && !item.equals(_adena))
 		{
 			_adena = item;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
index 6d9fffd12f..0ab1ed69d8 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
@@ -1128,12 +1128,15 @@ public class ItemInstance extends WorldObject
 	 * <li>Drop item</li>
 	 * <li>Call Pet</li><br>
 	 * @param dropper the dropper
-	 * @param x the x
-	 * @param y the y
-	 * @param z the z
+	 * @param xValue the x
+	 * @param yValue the y
+	 * @param zValue the z
 	 */
-	public void dropMe(Creature dropper, int x, int y, int z)
+	public void dropMe(Creature dropper, int xValue, int yValue, int zValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
 		if (Config.PATHFINDING && (dropper != null))
 		{
 			final Location dropDest = GeoEngine.getInstance().canMoveToTargetLoc(dropper.getX(), dropper.getY(), dropper.getZ(), x, y, z, dropper.getInstanceId());
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java
index 18c6fc0a93..022836d98c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/multisell/Multisell.java
@@ -359,8 +359,9 @@ public class Multisell
 		return list;
 	}
 	
-	protected MultiSellEntry parseEntry(Node n)
+	protected MultiSellEntry parseEntry(Node node)
 	{
+		Node n = node;
 		final int entryId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final Node first = n.getFirstChild();
 		final MultiSellEntry entry = new MultiSellEntry();
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java
index 0863b46846..b386e2961a 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestSpawn.java
@@ -63,15 +63,15 @@ public class QuestSpawn
 	/**
 	 * Add spawn for player instance Return object id of newly spawned npc
 	 * @param npcId
-	 * @param x
-	 * @param y
-	 * @param z
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
 	 * @param heading
 	 * @param randomOffset
 	 * @param despawnDelay
 	 * @return
 	 */
-	public NpcInstance addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay)
+	public NpcInstance addSpawn(int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, int despawnDelay)
 	{
 		NpcInstance result = null;
 		
@@ -82,12 +82,14 @@ public class QuestSpawn
 			{
 				// Sometimes, even if the quest script specifies some xyz (for example npc.getX() etc) by the time the code reaches here, xyz have become 0! Also, a questdev might have purposely set xy to 0,0...however,
 				// the spawn code is coded such that if x=y=0, it looks into location for the spawn loc! This will NOT work with quest spawns! For both of the above cases, we need a fail-safe spawn. For this, we use the default spawn location, which is at the player's loc.
-				if ((x == 0) && (y == 0))
+				if ((xValue == 0) && (yValue == 0))
 				{
 					LOGGER.warning("Failed to adjust bad locks for quest spawn!  Spawn aborted!");
 					return null;
 				}
 				
+				int x = xValue;
+				int y = yValue;
 				if (randomOffset)
 				{
 					int offset;
@@ -114,11 +116,12 @@ public class QuestSpawn
 					offset *= Rnd.get(50, 100);
 					y += offset;
 				}
+				
 				final Spawn spawn = new Spawn(template);
 				spawn.setHeading(heading);
 				spawn.setX(x);
 				spawn.setY(y);
-				spawn.setZ(z + 20);
+				spawn.setZ(zValue + 20);
 				spawn.stopRespawn();
 				result = spawn.doSpawn();
 				if (despawnDelay > 0)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index bd3799a83a..062bdf15b1 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -224,15 +224,16 @@ public class QuestState
 	/**
 	 * Add parameter used in quests.
 	 * @param var String pointing out the name of the variable for quest
-	 * @param value String pointing out the value of the variable for quest
+	 * @param val String pointing out the value of the variable for quest
 	 */
-	public void setInternal(String var, String value)
+	public void setInternal(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
@@ -250,15 +251,16 @@ public class QuestState
 	 * <li>If the key represented by "var" exists in Map "vars", the couple (var,value) is updated in the database. The key is known as existing if the preceding value of the key (given as result of function put()) is not null.<br>
 	 * If the key doesn't exist, the couple is added/created in the database</li><br>
 	 * @param var : String indicating the name of the variable for quest
-	 * @param value : String indicating the value of the variable for quest
+	 * @param val : String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
@@ -547,9 +549,9 @@ public class QuestState
 		giveItems(itemId, count, 0);
 	}
 	
-	public synchronized void giveItems(int itemId, int count, int enchantlevel)
+	public synchronized void giveItems(int itemId, int amount, int enchantlevel)
 	{
-		if (count <= 0)
+		if (amount <= 0)
 		{
 			return;
 		}
@@ -557,6 +559,7 @@ public class QuestState
 		final int questId = getQuest().getQuestId();
 		
 		// If item for reward is gold (ID=57), modify count with rate for quest reward
+		int count = amount;
 		if ((itemId == 57) && ((questId < 217) || (questId > 233)) && ((questId < 401) || (questId > 418)))
 		{
 			count = (int) (count * Config.RATE_QUESTS_REWARD);
@@ -609,9 +612,9 @@ public class QuestState
 	 * <li>Destroy quantity of items wanted</li>
 	 * <li>Send new inventory list to player</li><br>
 	 * @param itemId : Identifier of the item
-	 * @param count : Quantity of items to destroy
+	 * @param amount : Quantity of items to destroy
 	 */
-	public void takeItems(int itemId, int count)
+	public void takeItems(int itemId, int amount)
 	{
 		// Get object item from player's inventory list
 		final ItemInstance item = _player.getInventory().getItemByItemId(itemId);
@@ -626,6 +629,7 @@ public class QuestState
 		}
 		
 		// Tests on count value in order not to have negative value
+		int count = amount;
 		if ((count < 0) || (count > item.getCount()))
 		{
 			count = item.getCount();
@@ -702,9 +706,9 @@ public class QuestState
 		switch (type)
 		{
 			case DROP_DIVMOD:
-				dropChance *= Config.RATE_DROP_QUEST;
-				amount = count * (dropChance / DropData.MAX_CHANCE);
-				if (Rnd.get(DropData.MAX_CHANCE) < (dropChance % DropData.MAX_CHANCE))
+				final int chanceWithQuestRate = (int) (dropChance * Config.RATE_DROP_QUEST);
+				amount = count * (chanceWithQuestRate / DropData.MAX_CHANCE);
+				if (Rnd.get(DropData.MAX_CHANCE) < (chanceWithQuestRate % DropData.MAX_CHANCE))
 				{
 					amount += count;
 				}
@@ -802,9 +806,9 @@ public class QuestState
 			switch (type)
 			{
 				case DROP_DIVMOD:
-					dropChance *= Config.RATE_DROP_QUEST;
-					amount = count * (dropChance / DropData.MAX_CHANCE);
-					if (Rnd.get(DropData.MAX_CHANCE) < (dropChance % DropData.MAX_CHANCE))
+					final int chanceWithQuestRate = (int) (dropChance * Config.RATE_DROP_QUEST);
+					amount = count * (chanceWithQuestRate / DropData.MAX_CHANCE);
+					if (Rnd.get(DropData.MAX_CHANCE) < (chanceWithQuestRate % DropData.MAX_CHANCE))
 					{
 						amount += count;
 					}
@@ -902,8 +906,6 @@ public class QuestState
 	
 	public boolean dropQuestItems(int itemId, int minCount, int maxCount, int neededCount, int dropChance, boolean sound)
 	{
-		dropChance *= Config.RATE_DROP_QUEST / (_player.getParty() != null ? _player.getParty().getMemberCount() : 1);
-		
 		final int currentCount = getQuestItemsCount(itemId);
 		if ((neededCount > 0) && (currentCount >= neededCount))
 		{
@@ -918,7 +920,8 @@ public class QuestState
 		int itemCount = 0;
 		final int random = Rnd.get(DropData.MAX_CHANCE);
 		
-		while (random < dropChance)
+		int chanceWithQuestRate = (int) (dropChance * (Config.RATE_DROP_QUEST / (_player.getParty() != null ? _player.getParty().getMemberCount() : 1)));
+		while (random < chanceWithQuestRate)
 		{
 			// Get the item quantity dropped
 			if (minCount < maxCount)
@@ -935,7 +938,7 @@ public class QuestState
 			}
 			
 			// Prepare for next iteration if dropChance > DropData.MAX_CHANCE
-			dropChance -= DropData.MAX_CHANCE;
+			chanceWithQuestRate -= DropData.MAX_CHANCE;
 		}
 		
 		if (itemCount > 0)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStat.java
index a57f356346..2ce918dbcc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/BaseStat.java
@@ -81,16 +81,16 @@ public enum BaseStat
 	
 	public static final BaseStat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (BaseStat s : values())
 		{
-			if (s.getValue().equalsIgnoreCase(name))
+			if (s.getValue().equalsIgnoreCase(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 	
 	protected static final class STR implements IBaseStatFunction
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java
index 9231fb4b3f..bce665b4b4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java
@@ -2668,33 +2668,27 @@ public class Formulas
 			{
 				case BLEED:
 				{
-					multiplier = target.calcStat(Stat.BLEED_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.BLEED_VULN, multiplier, target, null);
 				}
 				case POISON:
 				{
-					multiplier = target.calcStat(Stat.POISON_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.POISON_VULN, multiplier, target, null);
 				}
 				case STUN:
 				{
-					multiplier = target.calcStat(Stat.STUN_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.STUN_VULN, multiplier, target, null);
 				}
 				case PARALYZE:
 				{
-					multiplier = target.calcStat(Stat.PARALYZE_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.PARALYZE_VULN, multiplier, target, null);
 				}
 				case ROOT:
 				{
-					multiplier = target.calcStat(Stat.ROOT_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.ROOT_VULN, multiplier, target, null);
 				}
 				case SLEEP:
 				{
-					multiplier = target.calcStat(Stat.SLEEP_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.SLEEP_VULN, multiplier, target, null);
 				}
 				case MUTE:
 				case FEAR:
@@ -2702,32 +2696,24 @@ public class Formulas
 				case AGGDEBUFF:
 				case ERASE:
 				{
-					multiplier = target.calcStat(Stat.DERANGEMENT_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.DERANGEMENT_VULN, multiplier, target, null);
 				}
 				case CONFUSION:
 				case CONFUSE_MOB_ONLY:
 				{
-					multiplier = target.calcStat(Stat.CONFUSION_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.CONFUSION_VULN, multiplier, target, null);
 				}
 				case DEBUFF:
 				{
-					multiplier = target.calcStat(Stat.DEBUFF_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.DEBUFF_VULN, multiplier, target, null);
 				}
 				case BUFF:
 				{
-					multiplier = target.calcStat(Stat.BUFF_VULN, multiplier, target, null);
-					break;
+					return target.calcStat(Stat.BUFF_VULN, multiplier, target, null);
 				}
 				case CANCEL:
 				{
-					multiplier = target.calcStat(Stat.CANCEL_VULN, multiplier, target, null);
-					break;
-				}
-				default:
-				{
+					return target.calcStat(Stat.CANCEL_VULN, multiplier, target, null);
 				}
 			}
 		}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stat.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stat.java
index fec13cb669..f6039d853c 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stat.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Stat.java
@@ -211,15 +211,15 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java
index 6e22cfdf60..2e0852dbdd 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java
@@ -131,22 +131,7 @@ public class AutoSpawn
 	 */
 	public AutoSpawnInstance registerSpawn(int npcId, int[][] spawnPoints, int initialDelay, int respawnDelay, int despawnDelay)
 	{
-		if (initialDelay < 0)
-		{
-			initialDelay = DEFAULT_INITIAL_SPAWN;
-		}
-		
-		if (respawnDelay < 0)
-		{
-			respawnDelay = DEFAULT_RESPAWN;
-		}
-		
-		if (despawnDelay < 0)
-		{
-			despawnDelay = DEFAULT_DESPAWN;
-		}
-		
-		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay);
+		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay < 0 ? DEFAULT_INITIAL_SPAWN : initialDelay, respawnDelay < 0 ? DEFAULT_RESPAWN : respawnDelay, despawnDelay < 0 ? DEFAULT_DESPAWN : despawnDelay);
 		if (spawnPoints != null)
 		{
 			for (int[] spawnPoint : spawnPoints)
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
index 1d81374706..d7a2aeca7e 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/spawn/Spawn.java
@@ -525,21 +525,16 @@ public class Spawn
 	}
 	
 	/**
-	 * @param i delay in seconds
+	 * @param value delay in seconds
 	 */
-	public void setRespawnDelay(int i)
+	public void setRespawnDelay(int value)
 	{
-		if (i < 0)
+		if (value < 0)
 		{
 			LOGGER.warning("respawn delay is negative for spawnId:" + _id);
 		}
 		
-		if (i < 10)
-		{
-			i = 10;
-		}
-		
-		_respawnDelay = i * 1000;
+		_respawnDelay = value < 10 ? 10000 : value * 1000;
 	}
 	
 	public NpcInstance getLastSpawn()
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
index 22e8d08cbc..32041cde64 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
@@ -484,6 +484,7 @@ public class MultiSellChoose extends GameClientPacket
 		}
 		
 		// Now modify the enchantment level of products, if necessary
+		int level = enchantLevel;
 		for (MultiSellIngredient ing : templateEntry.getProducts())
 		{
 			// Load the ingredient from the template
@@ -495,15 +496,16 @@ public class MultiSellChoose extends GameClientPacket
 				final Item tempItem = ItemTable.getInstance().createDummyItem(newIngredient.getItemId()).getItem();
 				if ((tempItem instanceof Armor) || (tempItem instanceof Weapon))
 				{
-					if ((enchantLevel == 0) && maintainEnchantment)
+					if ((level == 0) && maintainEnchantment)
 					{
-						enchantLevel = ing.getEnchantmentLevel();
+						level = ing.getEnchantmentLevel();
 					}
-					newIngredient.setEnchantmentLevel(enchantLevel);
+					newIngredient.setEnchantmentLevel(level);
 				}
 			}
 			newEntry.addProduct(newIngredient);
 		}
+		
 		return newEntry;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
index 61b61f3207..e37c0203b4 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
@@ -110,9 +110,9 @@ public class RequestConfirmRefinerItem extends GameClientPacket
 		player.sendPacket(sm);
 	}
 	
-	private int getLifeStoneGrade(int itemId)
+	private int getLifeStoneGrade(int itemIdValue)
 	{
-		itemId -= 8723;
+		int itemId = itemIdValue - 8723;
 		if (itemId < 10)
 		{
 			return 0; // normal grade
@@ -131,9 +131,9 @@ public class RequestConfirmRefinerItem extends GameClientPacket
 		return 3; // top grade
 	}
 	
-	private int getLifeStoneLevel(int itemId)
+	private int getLifeStoneLevel(int itemIdValue)
 	{
-		itemId -= 10 * getLifeStoneGrade(itemId);
+		int itemId = itemIdValue - (10 * getLifeStoneGrade(itemIdValue));
 		itemId -= 8722;
 		return itemId;
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
index a983e65e7a..d41d5db820 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
@@ -335,9 +335,9 @@ public class RequestRefine extends GameClientPacket
 		return true;
 	}
 	
-	private int getLifeStoneGrade(int itemId)
+	private int getLifeStoneGrade(int itemIdValue)
 	{
-		itemId -= 8723;
+		int itemId = itemIdValue - 8723;
 		if (itemId < 10)
 		{
 			return 0; // normal grade
@@ -356,9 +356,9 @@ public class RequestRefine extends GameClientPacket
 		return 3; // top grade
 	}
 	
-	private int getLifeStoneLevel(int itemId)
+	private int getLifeStoneLevel(int itemIdValue)
 	{
-		itemId -= 10 * getLifeStoneGrade(itemId);
+		int itemId = itemIdValue - (10 * getLifeStoneGrade(itemIdValue));
 		itemId -= 8722;
 		return itemId;
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index ea148b6aa7..e29bbcdb6d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -145,16 +145,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index 8ea3bd0de8..3abb070df7 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -45,8 +45,9 @@ public class AttackStanceTaskManager
 		ThreadPool.scheduleAtFixedRate(new FightModeScheduler(), 0, 1000);
 	}
 	
-	public void addAttackStanceTask(Creature actor)
+	public void addAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor instanceof Summon)
 		{
 			final Summon summon = (Summon) actor;
@@ -66,8 +67,9 @@ public class AttackStanceTaskManager
 		_attackStanceTasks.put(actor, System.currentTimeMillis());
 	}
 	
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor instanceof Summon)
 		{
 			final Summon summon = (Summon) actor;
@@ -76,8 +78,9 @@ public class AttackStanceTaskManager
 		_attackStanceTasks.remove(actor);
 	}
 	
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor instanceof Summon)
 		{
 			final Summon summon = (Summon) actor;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 0af9a945cd..eacb3cc042 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -143,13 +143,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
index 40c71bd9f8..1832148c29 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -105,10 +105,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, GameServerPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, GameServerPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -149,8 +150,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, GameServerPacket mov, long radiusSq)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, GameServerPacket mov, long radiusSqValue)
 	{
+		long radiusSq = radiusSqValue;
 		if (radiusSq < 0)
 		{
 			radiusSq = 360000;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index b399f56e7a..c67ff20d3d 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -38,7 +38,7 @@ public class HtmlUtil
 		return createPage(Arrays.asList(elements), elements.length, page, elementsPerPage, pagerFunction, bodyFunction);
 	}
 	
-	public static <T> PageResult createPage(Iterable<T> elements, int size, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
+	public static <T> PageResult createPage(Iterable<T> elements, int size, int pageValue, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
 	{
 		int pages = size / elementsPerPage;
 		if ((elementsPerPage * pages) < size)
@@ -63,6 +63,7 @@ public class HtmlUtil
 			}
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
index 439b4ca14a..4e08891582 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java
index c4dcd15e72..0f3288f8fb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/util/Util.java
@@ -120,12 +120,12 @@ public class Util
 	/**
 	 * Capitalizes the first letter of a string, and returns the result.<br>
 	 * (Based on ucfirst() function of PHP)
-	 * @param str
+	 * @param value
 	 * @return String containing the modified string.
 	 */
-	public static String capitalizeFirst(String str)
+	public static String capitalizeFirst(String value)
 	{
-		str = str.trim();
+		String str = value.trim();
 		if ((str.length() > 0) && Character.isLetter(str.charAt(0)))
 		{
 			return str.substring(0, 1).toUpperCase() + str.substring(1);
@@ -258,12 +258,13 @@ public class Util
 	
 	/**
 	 * Return amount of adena formatted with "," delimiter
-	 * @param amount
+	 * @param value
 	 * @return String formatted adena amount
 	 */
-	public static String formatAdena(int amount)
+	public static String formatAdena(int value)
 	{
 		String s = "";
+		int amount = value;
 		int rem = amount % 1000;
 		s = Integer.toString(rem);
 		amount = (amount - rem) / 1000;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginClient.java
index c6190fb0a6..459bbb8c12 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginClient.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginClient.java
@@ -139,9 +139,10 @@ public class LoginClient extends MMOClient<MMOConnection<LoginClient>>
 	}
 	
 	@Override
-	public boolean encrypt(ByteBuffer buf, int size)
+	public boolean encrypt(ByteBuffer buf, int sizeValue)
 	{
 		final int offset = buf.position();
+		int size = sizeValue;
 		try
 		{
 			size = _loginCrypt.encrypt(buf.array(), offset, size);
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index db9887906a..59c5ee5476 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -271,11 +271,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 366b8421d1..539e4de127 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -186,12 +186,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index b6fb30b20e..9ee155e0e3 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -321,7 +321,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getLocalizedMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getLocalizedMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_CT_2.4_Epilogue/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
index 1ff7451e39..5e62b82534 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -55,13 +55,9 @@ public class Bernarde extends AbstractNpcAI
 					&& (player.getInventory().getInventoryItemCount(DARION_BADGE, -1, false) >= 5) //
 					&& player.exchangeItemsById("Quest", npc, DARION_BADGE, 5, HOLY_WATER, 1, true))
 				{
-					event = "32300-02b.htm";
+					return "32300-02b.htm";
 				}
-				else
-				{
-					event = "32300-02c.htm";
-				}
-				break;
+				return "32300-02c.htm";
 			}
 			case "Treasure":
 			{
@@ -71,13 +67,11 @@ public class Bernarde extends AbstractNpcAI
 					takeItems(player, TREASURE, -1);
 					return "32300-02d.htm";
 				}
-				event = "32300-02e.htm";
-				break;
+				return "32300-02e.htm";
 			}
 			case "rumors":
 			{
-				event = "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
-				break;
+				return "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 66f69e319a..4a965ae472 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b8a6287f61..c04b3996fb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -359,6 +359,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -366,12 +367,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -382,33 +383,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
index 5d9135ddda..7c7dc19539 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Survivor/Survivor.java
@@ -50,7 +50,7 @@ public class Survivor extends AbstractNpcAI
 		{
 			if (player.getLevel() < MIN_LEVEL)
 			{
-				event = "32632-3.htm";
+				return "32632-3.htm";
 			}
 			else if (player.getAdena() < 150000)
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index de7069f968..a987068947 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -919,8 +919,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
 		{
 			_nextSiege.cancel(true);
 		}
-		date -= 3600000;
-		setRegistrationEndString(date);
+		setRegistrationEndString(date - 3600000);
 		_nextSiege = ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index be31a3c1ca..d1f6a0580d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -57,8 +57,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_getbuffs"))
 		{
 			final StringTokenizer st = new StringTokenizer(command, " ");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 45793ef4fa..c09ab9af37 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -985,8 +985,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index f01670d855..d6ea97b303 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -99,8 +99,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index bd1d70c6e0..19b6326030 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -159,10 +159,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -176,7 +176,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -290,7 +290,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -320,7 +320,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -333,7 +333,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			((MonsterInstance) npc1).deleteMe();
 			((MonsterInstance) npc2).deleteMe();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 2ee50e9848..12d742787f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -51,8 +51,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index e3d5c09a11..1750693f1d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index debe367ff2..80c5f0ee43 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -69,8 +69,9 @@ public class AdminSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 6a7d743c24..a79389fce8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -82,8 +82,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -277,9 +278,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -297,6 +298,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 065c720f50..44ad100169 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -470,7 +470,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -479,6 +479,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		NpcTemplate template;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -503,6 +504,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.getInstanceId() > 0)
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
index e16d083615..fb49e9ebe3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
@@ -44,8 +44,9 @@ public class AdminTerritoryWar implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		command = st.nextToken();
 		if (command.equals("admin_territory_war"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index dc405b083c..ebf963a45a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -224,7 +224,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -249,6 +249,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
index 9a73b58216..1429e1075d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
@@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
 		return false;
 	}
 	
-	public static void tryRentPet(PlayerInstance player, int value)
+	public static void tryRentPet(PlayerInstance player, int petValue)
 	{
 		if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
 		{
@@ -106,6 +106,7 @@ public class RentPet implements IBypassHandler
 			1800
 		};
 		
+		int value = petValue;
 		if (value > 10)
 		{
 			petId = 12526;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 90fe1927fe..392a0ee723 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -42,7 +42,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -50,6 +50,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 753536adc8..8eb9eaf693 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
index b6ff96a481..1075ce5408 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
@@ -36,8 +36,8 @@ public class AreaSummon implements ITargetTypeHandler
 	public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target)
 	{
 		final List<Creature> targetList = new ArrayList<>();
-		target = creature.getSummon();
-		if ((target == null) || !target.isServitor() || target.isDead())
+		final Creature targetCreature = creature.getSummon();
+		if ((targetCreature == null) || !targetCreature.isServitor() || targetCreature.isDead())
 		{
 			return EMPTY_TARGET_LIST;
 		}
@@ -46,13 +46,13 @@ public class AreaSummon implements ITargetTypeHandler
 		{
 			return new Creature[]
 			{
-				target
+				targetCreature
 			};
 		}
 		
 		final boolean srcInArena = (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE));
 		final int maxTargets = skill.getAffectLimit();
-		World.getInstance().forEachVisibleObjectInRange(target, Creature.class, skill.getAffectRange(), obj ->
+		World.getInstance().forEachVisibleObjectInRange(targetCreature, Creature.class, skill.getAffectRange(), obj ->
 		{
 			if (obj == creature)
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index d02ed7a37b..54c96baaca 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -383,30 +383,32 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num, int npcId)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 7e3b1b130e..8748ed4d6e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -320,30 +320,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index d857b6e650..9070c5b7f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -260,7 +260,7 @@ public class Q00511_AwlUnderFoot extends Quest
 		return null;
 	}
 	
-	protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String ret)
+	protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String retValue)
 	{
 		// check for existing instances for this player
 		InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
@@ -275,16 +275,19 @@ public class Q00511_AwlUnderFoot extends Quest
 			teleportPlayer(player, coords, world.getInstanceId());
 			return "";
 		}
+		
 		// New instance
+		if (retValue != null)
+		{
+			return retValue;
+		}
+		
+		final String ret = checkConditions(player);
 		if (ret != null)
 		{
 			return ret;
 		}
-		ret = checkConditions(player);
-		if (ret != null)
-		{
-			return ret;
-		}
+		
 		final Party party = player.getParty();
 		world = new FAUWorld();
 		final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index a99ce70ea2..6171ba6feb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -341,8 +341,9 @@ public class Q00660_AidingTheFloranVillage extends Quest
 		return htmltext;
 	}
 	
-	private void tradeItems(PlayerInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
+	private void tradeItems(PlayerInstance player, long requiredValue, long itemCount1, long itemCount2, long itemCount3)
 	{
+		long required = requiredValue;
 		if (itemCount1 < required)
 		{
 			takeItems(player, WATCHING_EYES, itemCount1);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index f924b7d769..a1b19ad874 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -238,7 +238,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 		return null;
 	}
 	
-	protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String ret)
+	protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String retValue)
 	{
 		InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
 		if (world != null)
@@ -252,15 +252,17 @@ public class Q00726_LightWithinTheDarkness extends Quest
 			return "";
 		}
 		
+		if (retValue != null)
+		{
+			return retValue;
+		}
+		
+		final String ret = checkConditions(player);
 		if (ret != null)
 		{
 			return ret;
 		}
-		ret = checkConditions(player);
-		if (ret != null)
-		{
-			return ret;
-		}
+		
 		final Party party = player.getParty();
 		world = new PAWORLD();
 		final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 1633ca260d..0d557c32c9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -101,13 +101,9 @@ public class Q10272_LightFragment extends Quest
 				if (getQuestItemsCount(player, Inventory.ADENA_ID) >= 10000)
 				{
 					takeItems(player, Inventory.ADENA_ID, 10000);
-					event = "32566-05.html";
+					return "32566-05.html";
 				}
-				else
-				{
-					event = "32566-04a.html";
-				}
-				break;
+				return "32566-04a.html";
 			}
 			case "32567-04.html":
 			{
@@ -128,7 +124,7 @@ public class Q10272_LightFragment extends Quest
 				}
 				else
 				{
-					event = "32557-04.html";
+					return "32557-04.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 3df6603c8f..8149fb5043 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -93,7 +93,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 90339f6c85..e142c280fb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -112,7 +112,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
index 9179aab112..1910294485 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/GameServer.java
@@ -497,9 +497,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java
index 1a67dc0bf9..bfd8ca71d3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java
@@ -1980,10 +1980,10 @@ public class SevenSignsFestival implements SpawnListener
 		 * Returns the running instance of a festival for the given Oracle and festivalID.<br>
 		 * A <b>null</b> value is returned if there are no participants in that festival.
 		 * @param oracle
-		 * @param festivalId
+		 * @param festivalIdValue
 		 * @return DarknessFestival festivalInst
 		 */
-		public DarknessFestival getFestivalInstance(int oracle, int festivalId)
+		public DarknessFestival getFestivalInstance(int oracle, int festivalIdValue)
 		{
 			if (!_festivalInitialized)
 			{
@@ -1994,6 +1994,7 @@ public class SevenSignsFestival implements SpawnListener
 			 * Compute the offset if a Dusk instance is required. ID: 0 1 2 3 4 Dusk 1:1011121314 Dawn 2:2021222324
 			 */
 			
+			int festivalId = festivalIdValue;
 			festivalId += (oracle == SevenSigns.CABAL_DUSK) ? 10 : 20;
 			return _festivalInstances.get(festivalId);
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java
index 79aa571e91..9c89c5a7bc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/Shutdown.java
@@ -101,11 +101,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 5ea2d3dcf3..82f2442e2c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -485,13 +485,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index cbf0a1b623..df5626a904 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -325,13 +325,14 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
@@ -359,7 +360,6 @@ public class AttackableAI extends CreatureAI
 				
 				// Cancel the AI
 				_actor.detachAI();
-				
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index d44b9d7eb8..8f3de5d807 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -994,10 +994,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -1005,12 +1005,12 @@ public class CreatureAI extends AbstractAI
 			// LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1057,6 +1057,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
index 01975ffd18..245c25a3bf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
@@ -152,27 +152,30 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target.isSummon())
+		Creature currentTarget = target;
+		if (currentTarget.isSummon())
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius3D(owner, 1000))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
-		return (!target.isPlayable() || !((Playable) target).isSilentMovingAffected() || _actor.isInsideRadius2D(target, 250)) && _actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target);
+		
+		return (!currentTarget.isPlayable() || !((Playable) currentTarget).isSilentMovingAffected() || _actor.isInsideRadius2D(currentTarget, 250)) && _actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget);
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
 			// Check if actor is not dead
@@ -728,8 +731,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -780,8 +782,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
index 4fffd55c7c..1eb651afe5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
@@ -137,35 +137,37 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target.isSummon())
+		Creature currentTarget = target;
+		if (currentTarget.isSummon())
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius3D(owner, 1000))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
 		
 		// Check if the target isn't in silent move mode AND too far (>100)
-		if (target.isPlayable() && ((Playable) target).isSilentMovingAffected() && !_actor.isInsideRadius2D(target, 250))
+		if (currentTarget.isPlayable() && ((Playable) currentTarget).isSilentMovingAffected() && !_actor.isInsideRadius2D(currentTarget, 250))
 		{
 			return false;
 		}
 		
 		// Los Check Here
-		return (_actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target));
+		return (_actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget));
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
 			// Check if actor is not dead
@@ -198,7 +200,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 				
 				// Cancel the AI
 				_actor.detachAI();
-				
 				return;
 			}
 		}
@@ -731,8 +732,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -783,8 +783,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index bdd3cbf6ad..d3e97f8764 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -155,8 +155,9 @@ public class MultisellData implements IXmlReader
 		return NUMERIC_FILTER;
 	}
 	
-	private final Entry parseEntry(Node n, int entryId, ListContainer list)
+	private final Entry parseEntry(Node node, int entryId, ListContainer list)
 	{
+		Node n = node;
 		final Node first = n.getFirstChild();
 		final Entry entry = new Entry(entryId);
 		NamedNodeMap attrs;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index e86ae2263b..6e55d0fb02 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -343,10 +343,11 @@ public class SkillTreeData implements IXmlReader
 		skillTree.putAll(_commonSkillTree);
 		
 		final LinkedList<ClassId> classSequence = new LinkedList<>();
-		while (classId != null)
+		ClassId currentClassId = classId;
+		while (currentClassId != null)
 		{
-			classSequence.addFirst(classId);
-			classId = _parentClassMap.get(classId);
+			classSequence.addFirst(currentClassId);
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		
 		for (ClassId cid : classSequence)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
index eb8cb5483b..349719469b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
@@ -510,7 +510,7 @@ public class AugmentationData
 		}
 	}
 	
-	private Augmentation generateRandomWeaponAugmentation(int lifeStoneLevel, int lifeStoneGrade, int lifeStoneId, ItemInstance item)
+	private Augmentation generateRandomWeaponAugmentation(int level, int lifeStoneGrade, int lifeStoneId, ItemInstance item)
 	{
 		int stat12 = 0;
 		int stat34 = 0;
@@ -709,7 +709,7 @@ public class AugmentationData
 		boolean generateGlow = false;
 		
 		// life stone level is used for stat Id and skill level, but here the max level is 9
-		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		int lifeStoneLevel = Math.min(level, 9);
 		
 		switch (lifeStoneGrade)
 		{
@@ -883,7 +883,7 @@ public class AugmentationData
 		return new Augmentation(((stat34 << 16) + stat12));
 	}
 	
-	private Augmentation generateRandomAccessoryAugmentation(int lifeStoneLevel, int bodyPart, int lifeStoneId)
+	private Augmentation generateRandomAccessoryAugmentation(int level, int bodyPart, int lifeStoneId)
 	{
 		int stat12 = 0;
 		int stat34 = 0;
@@ -952,7 +952,7 @@ public class AugmentationData
 			}
 			return new Augmentation(((stat34 << 16) + stat12));
 		}
-		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		int lifeStoneLevel = Math.min(level, 9);
 		int base = 0;
 		int skillsLength = 0;
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 775d80249e..04fff3ee19 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -184,19 +184,20 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
-		parseTemplate(n, template, null);
+		parseTemplate(node, template, null);
 	}
 	
-	protected void parseTemplate(Node n, Object template, EffectScope effectScope)
+	protected void parseTemplate(Node node, Object template, EffectScope effectScope)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -332,13 +333,14 @@ public abstract class DocumentBase
 	
 	/**
 	 * Parse effect's parameters.
-	 * @param n the node to start the parsing
+	 * @param node the node to start the parsing
 	 * @param template the effect template
 	 * @return the list of parameters if any, {@code null} otherwise
 	 */
-	private StatSet parseParameters(Node n, Object template)
+	private StatSet parseParameters(Node node, Object template)
 	{
 		StatSet parameters = null;
+		Node n = node;
 		while ((n != null))
 		{
 			// Parse all parameters.
@@ -360,8 +362,9 @@ public abstract class DocumentBase
 		return parameters == null ? StatSet.EMPTY_STATSET : parameters;
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -409,12 +412,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -429,9 +434,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -446,8 +452,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index 49f979e5f9..9f5e753dd2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -93,8 +93,9 @@ public class DocumentItem extends DocumentBase
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
index 83c391e630..fc7159d4bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
@@ -116,8 +116,9 @@ public class DocumentSkill extends DocumentBase
 		}
 	}
 	
-	protected void parseSkill(Node n)
+	protected void parseSkill(Node node)
 	{
+		Node n = node;
 		final NamedNodeMap attrs = n.getAttributes();
 		int enchantLevels1 = 0;
 		int enchantLevels2 = 0;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index e4c0d434dd..f29d691613 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -484,19 +484,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instanceId
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, int instanceId)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, int instanceId)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index 8601662f15..09c482a29a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -166,10 +166,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -179,6 +179,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/TelnetHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
index a6a82cf11b..ea9ce3e7f9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
@@ -50,8 +50,9 @@ public class TelnetHandler implements IHandler<ITelnetHandler, String>
 	}
 	
 	@Override
-	public ITelnetHandler getHandler(String command)
+	public ITelnetHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index ba37026cbd..eef29baa34 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -64,13 +64,14 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastleIndex(obj, Long.MAX_VALUE);
 	}
 	
-	public int findNearestCastleIndex(WorldObject obj, long maxDistance)
+	public int findNearestCastleIndex(WorldObject obj, long maxDistanceValue)
 	{
 		int index = getCastleIndex(obj);
 		if (index < 0)
 		{
-			double distance;
 			Castle castle;
+			double distance;
+			long maxDistance = maxDistanceValue;
 			for (int i = 0; i < _castles.size(); i++)
 			{
 				castle = _castles.get(i);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 20003ebc1a..5e81274b2e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -41,13 +41,14 @@ public class FortManager implements InstanceListManager
 		return findNearestFortIndex(obj, Long.MAX_VALUE);
 	}
 	
-	public int findNearestFortIndex(WorldObject obj, long maxDistance)
+	public int findNearestFortIndex(WorldObject obj, long maxDistanceValue)
 	{
 		int index = getFortIndex(obj);
 		if (index < 0)
 		{
-			double distance;
 			Fort fort;
+			double distance;
+			long maxDistance = maxDistanceValue;
 			for (int i = 0; i < _forts.size(); i++)
 			{
 				fort = _forts.get(i);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
index d20b15038c..7f308a3505 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
@@ -1367,8 +1367,9 @@ public class FourSepulchersManager
 		}
 	}
 	
-	protected byte minuteSelect(byte min)
+	protected byte minuteSelect(byte value)
 	{
+		byte min = value;
 		if ((min % 5) != 0) // if doesn't divides on 5 fully
 		{
 			// mad table for selecting proper minutes...
@@ -1466,17 +1467,17 @@ public class FourSepulchersManager
 		return min;
 	}
 	
-	public void managerSay(byte min)
+	public void managerSay(byte value)
 	{
 		// for attack phase, sending message every 5 minutes
 		if (_inAttackTime)
 		{
-			if (min < 5)
+			if (value < 5)
 			{
 				return; // do not shout when < 5 minutes
 			}
 			
-			min = minuteSelect(min);
+			final byte min = minuteSelect(value);
 			NpcStringId msg = NpcStringId.MINUTE_S_HAVE_PASSED;
 			if (min == 90)
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
index 2faf13199d..c014787c05 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
@@ -392,18 +392,20 @@ public class Lottery
 		}
 	}
 	
-	public int[] decodeNumbers(int enchant, int type2)
+	public int[] decodeNumbers(int enchantValue, int type2Value)
 	{
 		final int[] res = new int[5];
 		int id = 0;
 		int nr = 1;
 		
+		int enchant = enchantValue;
 		while (enchant > 0)
 		{
 			final int val = enchant / 2;
-			if (val != Math.round((double) enchant / 2))
+			if (val != ((double) enchant / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			enchant /= 2;
 			nr++;
@@ -411,12 +413,14 @@ public class Lottery
 		
 		nr = 17;
 		
+		int type2 = type2Value;
 		while (type2 > 0)
 		{
 			final int val = type2 / 2;
 			if (val != ((double) type2 / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			type2 /= 2;
 			nr++;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
index f9d9eb88e0..3804282ce2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
@@ -168,22 +168,7 @@ public class AutoSpawnHandler
 	 */
 	public AutoSpawnInstance registerSpawn(int npcId, int[][] spawnPoints, int initialDelay, int respawnDelay, int despawnDelay)
 	{
-		if (initialDelay < 0)
-		{
-			initialDelay = DEFAULT_INITIAL_SPAWN;
-		}
-		
-		if (respawnDelay < 0)
-		{
-			respawnDelay = DEFAULT_RESPAWN;
-		}
-		
-		if (despawnDelay < 0)
-		{
-			despawnDelay = DEFAULT_DESPAWN;
-		}
-		
-		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay);
+		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay < 0 ? DEFAULT_INITIAL_SPAWN : initialDelay, respawnDelay < 0 ? DEFAULT_RESPAWN : respawnDelay, despawnDelay < 0 ? DEFAULT_DESPAWN : despawnDelay);
 		if (spawnPoints != null)
 		{
 			for (int[] spawnPoint : spawnPoints)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
index 1e7fc19517..9f2fe0ff32 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Party.java
@@ -707,18 +707,18 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param partyDmg
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, long partyDmg, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, long partyDmg, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size());
-		spReward *= getSpBonus(validMembers.size());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size());
+		double spReward = spRewardValue * getSpBonus(validMembers.size());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java
index b74dfcb361..0032035354 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java
index 45fea8fce1..26bf09c73d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -189,25 +189,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -515,24 +518,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2a69979c47..1fd1e44a76 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -646,9 +646,9 @@ public class Attackable extends Npc
 	 * Adds damage and hate to the attacker aggression list for this character.
 	 * @param attacker The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature attacker, int damage, int aggroValue)
 	{
 		if ((attacker == null) || (attacker == this))
 		{
@@ -668,6 +668,7 @@ public class Attackable extends Npc
 		// Traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		final PlayerInstance targetPlayer = attacker.getActingPlayer();
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
@@ -725,8 +726,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
@@ -768,6 +768,7 @@ public class Attackable extends Npc
 		{
 			return;
 		}
+		
 		final AggroInfo ai = _aggroList.get(target);
 		if (ai != null)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 44845127f1..d558e70c17 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -656,15 +656,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
 	 * @param instanceId
 	 * @param randomOffset
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, int instanceId, int randomOffset)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, int instanceId, int randomOffset)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		
 		setInstanceId(instanceId);
 		
 		if (_isPendingRevive)
@@ -1523,11 +1528,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		beginCast(skill, true, target, targets);
 	}
 	
-	private void beginCast(Skill skill, boolean simultaneously)
+	private void beginCast(Skill skill, boolean isSimultaneous)
 	{
 		if (!checkDoCastConditions(skill))
 		{
-			if (simultaneously)
+			if (isSimultaneous)
 			{
 				setCastingSimultaneouslyNow(false);
 			}
@@ -1543,6 +1548,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Override casting type
+		boolean simultaneously = isSimultaneous;
 		if (skill.isSimultaneousCast() && !simultaneously)
 		{
 			simultaneously = true;
@@ -1623,6 +1629,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 		}
+		
 		beginCast(skill, simultaneously, target, targets);
 	}
 	
@@ -4117,9 +4124,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -4168,12 +4175,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -4182,6 +4189,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -4639,13 +4651,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>if attack isn't aborted and hit isn't missed, manage attack or cast break of the target (calculating rate, sending message...)</li>
 	 * </ul>
 	 * @param target The Creature targeted
-	 * @param damage Number of HP to reduce
+	 * @param damageValue Number of HP to reduce
 	 * @param crit True if hit is critical
 	 * @param miss True if hit is missed
 	 * @param soulshot True if SoulShot are charged
 	 * @param shld True if shield is efficient
 	 */
-	public void onHitTimer(Creature target, int damage, boolean crit, boolean miss, boolean soulshot, byte shld)
+	public void onHitTimer(Creature target, int damageValue, boolean crit, boolean miss, boolean soulshot, byte shld)
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
@@ -4688,6 +4700,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Send message about damage/crit or miss
+		int damage = damageValue;
 		sendDamageMessage(target, damage, false, crit, miss);
 		
 		// Check Raidboss attack Creature will be petrified if attacking a raid that's more than 8 levels lower
@@ -6291,6 +6304,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			{
 				return;
 			}
+			
 			if (skill.checkCondition(this, target, false))
 			{
 				if (isSkillDisabled(skill))
@@ -6311,25 +6325,26 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				
+				Creature skillTarget = target;
 				for (WorldObject obj : targets)
 				{
 					if ((obj != null) && obj.isCreature())
 					{
-						target = (Creature) obj;
+						skillTarget = (Creature) obj;
 						break;
 					}
 				}
 				
-				if (Config.ALT_VALIDATE_TRIGGER_SKILLS && isPlayable() && (target != null) && target.isPlayable())
+				if (Config.ALT_VALIDATE_TRIGGER_SKILLS && isPlayable() && (skillTarget != null) && skillTarget.isPlayable())
 				{
 					final PlayerInstance player = getActingPlayer();
-					if (!player.checkPvpSkill(target, skill))
+					if (!player.checkPvpSkill(skillTarget, skill))
 					{
 						return;
 					}
 				}
 				
-				broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+				broadcastPacket(new MagicSkillUse(this, skillTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				broadcastPacket(new MagicSkillLaunched(this, skill.getDisplayId(), skill.getLevel(), targets));
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 14464a962f..8c89b4d45a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -770,8 +770,7 @@ public class Npc extends Creature
 	public void insertObjectIdAndShowChatWindow(PlayerInstance player, String content)
 	{
 		// Send a Server->Client packet NpcHtmlMessage to the PlayerInstance in order to display the message of the NpcInstance
-		content = content.replaceAll("%objectId%", String.valueOf(getObjectId()));
-		player.sendPacket(new NpcHtmlMessage(getObjectId(), content));
+		player.sendPacket(new NpcHtmlMessage(getObjectId(), content.replaceAll("%objectId%", String.valueOf(getObjectId()))));
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index b6660dfa22..97f4b7382d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -114,8 +114,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index 6d70f70cba..5da0700f83 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -143,13 +143,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -207,6 +208,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index b3a54d3198..c4f3f3e929 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -790,19 +790,18 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
-		if (dropit == null)
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
+		if (dropit != null)
 		{
-			return;
+			if (protect)
+			{
+				dropit.getDropProtection().protect(getOwner());
+			}
+			LOGGER_PET.finer("Item id to drop: " + dropit.getId() + " amount: " + dropit.getCount());
+			dropit.dropMe(this, getX(), getY(), getZ() + 100);
 		}
-		if (protect)
-		{
-			dropit.getDropProtection().protect(getOwner());
-		}
-		LOGGER_PET.finer("Item id to drop: " + dropit.getId() + " amount: " + dropit.getCount());
-		dropit.dropMe(this, getX(), getY(), getZ() + 100);
 	}
 	
 	public void dropItemHere(ItemInstance dropit)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 35e08100c8..dfaa6fda9a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2044,13 +2044,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the Karma of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param karma
+	 * @param value
 	 */
 	@Override
-	public void setKarma(int karma)
+	public void setKarma(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerKarmaChanged(this, getKarma(), karma), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerKarmaChanged(this, getKarma(), value), this);
+		
+		int karma = value;
 		if (karma < 0)
 		{
 			karma = 0;
@@ -2757,12 +2759,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2809,12 +2806,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3461,8 +3453,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3475,7 +3467,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -3495,13 +3487,13 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 			}
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 			}
 			sendPacket(sm);
 		}
@@ -3762,8 +3754,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3772,33 +3764,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(!(!item.isEquipable() || (item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM)));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -3815,7 +3807,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4824,11 +4816,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer());
@@ -8111,23 +8104,21 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		slot--;
-		
-		final Henna henna = _henna[slot];
+		final Henna henna = _henna[slot - 1];
 		if (henna == null)
 		{
 			return false;
 		}
 		
-		_henna[slot] = null;
+		_henna[slot - 1] = null;
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement ps = con.prepareStatement(DELETE_CHAR_HENNA))
+			PreparedStatement statement = con.prepareStatement(DELETE_CHAR_HENNA))
 		{
-			ps.setInt(1, getObjectId());
-			ps.setInt(2, slot + 1);
-			ps.setInt(3, _classIndex);
-			ps.execute();
+			statement.setInt(1, getObjectId());
+			statement.setInt(2, slot);
+			statement.setInt(3, _classIndex);
+			statement.execute();
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index 9e75e49593..ab59afb4e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
index a0b4f9b7ed..28a81dc2cc 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
@@ -223,11 +223,12 @@ public class SepulcherNpcInstance extends Npc
 			{
 				setInvul(false);
 				reduceCurrentHp(getMaxHp() + 1, player, null);
+				PlayerInstance leader = player;
 				if ((player.getParty() != null) && !player.getParty().isLeader(player))
 				{
-					player = player.getParty().getLeader();
+					leader = player.getParty().getLeader();
 				}
-				player.addItem("Quest", HALLS_KEY, 1, player, true);
+				leader.addItem("Quest", HALLS_KEY, 1, leader, true);
 				break;
 			}
 			default:
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index f86a9d7df7..af5c011d8d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -41,19 +41,20 @@ public class PlayableStat extends CreatureStat
 		super(activeChar);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -77,6 +78,7 @@ public class PlayableStat extends CreatureStat
 			level = --tmp;
 			break;
 		}
+		
 		if ((level != getLevel()) && (level >= minimumLevel))
 		{
 			addLevel((byte) (level - getLevel()));
@@ -85,8 +87,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if ((getExp() - value) < 0)
 		{
 			value = getExp() - 1;
@@ -131,8 +134,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -171,19 +175,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -193,14 +199,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index dd895519b9..8f3c928b47 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -110,7 +110,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public boolean addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public boolean addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -120,6 +120,9 @@ public class PlayerStat extends PlayableStat
 			return false;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -426,9 +429,10 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
@@ -437,7 +441,7 @@ public class PlayerStat extends PlayableStat
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -676,9 +680,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == _vitalityPoints)
 		{
 			return;
@@ -689,13 +693,14 @@ public class PlayerStat extends PlayableStat
 		getActiveChar().sendPacket(new ExVitalityPointInfo(getVitalityPoints()));
 	}
 	
-	public synchronized void updateVitalityPoints(float points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(float value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		float points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index b13c954689..b150d939f3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -101,7 +101,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -137,27 +138,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getSummon();
 			if (getActiveChar().hasServitor() && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().calcStat(Stat.MANA_SHIELD_PERCENT, 0, null, null)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.MANA_SHIELD_PERCENT, 0, null, null)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -173,7 +174,7 @@ public class PlayerStatus extends PlayableStatus
 			final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
-				int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) value * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100);
+				int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100);
 				if (transferDmg > 0)
 				{
 					int membersInRange = 0;
@@ -201,22 +202,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -252,10 +253,10 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			value = getCurrentHp() - value;
-			if (value <= 0)
+			amount = getCurrentHp() - amount;
+			if (amount <= 0)
 			{
 				if (getActiveChar().isInDuel())
 				{
@@ -271,14 +272,14 @@ public class PlayerStatus extends PlayableStatus
 					
 					// let the DuelManager know of his defeat
 					DuelManager.getInstance().onPlayerDefeat(getActiveChar());
-					value = 1;
+					amount = 1;
 				}
 				else
 				{
-					value = 0;
+					amount = 0;
 				}
 			}
-			setCurrentHp(value);
+			setCurrentHp(amount);
 		}
 		
 		if ((getActiveChar().getCurrentHp() < 0.5) && !isHPConsumption)
@@ -337,7 +338,7 @@ public class PlayerStatus extends PlayableStatus
 		setCurrentCp(newCp, true);
 	}
 	
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -350,11 +351,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 9d5e8f3b8b..7a81967c49 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -108,6 +109,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 6e917e0562..1f7e32ba2a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -868,13 +868,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -884,13 +884,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 55c4b7f8c7..e3a705cf43 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -99,9 +99,9 @@ public class SubClass
 	{
 		if (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -119,13 +119,14 @@ public class SubClass
 	{
 		if (levelValue > MAX_LEVEL)
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 7a18cea0bd..b342b04d3e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1151,8 +1151,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1827,10 +1828,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1907,8 +1908,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1916,18 +1916,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Auction.java
index ee11e3cff9..514f121ef1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Auction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Auction.java
@@ -283,9 +283,10 @@ public class Auction
 	 */
 	private void returnItem(String clanName, long quantity, boolean penalty)
 	{
+		long amount = quantity;
 		if (penalty)
 		{
-			quantity *= 0.9; // take 10% tax fee if needed
+			amount *= 0.9; // take 10% tax fee if needed
 		}
 		
 		final Clan clan = ClanTable.getInstance().getClanByName(clanName);
@@ -304,8 +305,8 @@ public class Auction
 		
 		// avoid overflow on return
 		final long limit = MAX_ADENA - cwh.getAdena();
-		quantity = Math.min(quantity, limit);
-		cwh.addItem("Outbidded", ADENA_ID, quantity, null, null);
+		amount = Math.min(amount, limit);
+		cwh.addItem("Outbidded", ADENA_ID, amount, null, null);
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 9190fc1f00..254d12e499 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -271,9 +271,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -281,6 +281,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		if (getName().equalsIgnoreCase("Schuttgart") || getName().equalsIgnoreCase("Goddard"))
 		{
 			final Castle rune = CastleManager.getInstance().getCastle("rune");
@@ -314,16 +315,17 @@ public class Castle extends AbstractResidence
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -333,16 +335,13 @@ public class Castle extends AbstractResidence
 			}
 			_treasury -= amount;
 		}
+		else if ((_treasury + amount) > Inventory.MAX_ADENA)
+		{
+			_treasury = Inventory.MAX_ADENA;
+		}
 		else
 		{
-			if ((_treasury + amount) > Inventory.MAX_ADENA)
-			{
-				_treasury = Inventory.MAX_ADENA;
-			}
-			else
-			{
-				_treasury += amount;
-			}
+			_treasury += amount;
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
@@ -356,6 +355,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java
index a26cfc3f94..fd19198bc0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -186,10 +186,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f8b097ced5..7ea09057e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1837,9 +1837,9 @@ public abstract class AbstractScript extends ManagedScript
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -1850,16 +1850,18 @@ public abstract class AbstractScript extends ManagedScript
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId)
 	{
 		try
 		{
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.log(Level.SEVERE, "addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -1879,7 +1881,7 @@ public abstract class AbstractScript extends ManagedScript
 			final Spawn spawn = new Spawn(npcId);
 			spawn.setInstanceId(instanceId);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2212,11 +2214,11 @@ public abstract class AbstractScript extends ManagedScript
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2227,6 +2229,7 @@ public abstract class AbstractScript extends ManagedScript
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2468,29 +2471,29 @@ public abstract class AbstractScript extends ManagedScript
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index b8405587c5..18bf029f5d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6f5aa6069d..28f8ecc7e7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -484,8 +484,9 @@ public class Instance
 		}
 	}
 	
-	private void parseInstance(Node n) throws Exception
+	private void parseInstance(Node node) throws Exception
 	{
+		Node n = node;
 		_templateId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		Node a = n.getAttributes().getNamedItem("ejectTime");
 		if (a != null)
@@ -758,11 +759,12 @@ public class Instance
 		}
 	}
 	
-	protected void doCheckTimeUp(int remaining)
+	protected void doCheckTimeUp(int value)
 	{
 		CreatureSay cs = null;
 		int timeLeft;
 		int interval;
+		int remaining = value;
 		if (_players.isEmpty() && (_emptyDestroyTime == 0))
 		{
 			remaining = 0;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 9b3ddd5672..324f5cbcbb 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -76,13 +76,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -237,32 +238,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange(ItemInstance.ADDED);
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -320,13 +322,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -349,6 +351,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 47280fce18..865488ad2d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -446,24 +446,25 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		
-		if ((item != null) && (item.getId() == ADENA_ID) && !item.equals(_adena))
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			_adena = item;
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
+			{
+				_adena = addedItem;
+			}
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
+			{
+				_ancientAdena = addedItem;
+			}
+			
+			if (actor != null)
+			{
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor);
+			}
 		}
-		
-		if ((item != null) && (item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
-		{
-			_ancientAdena = item;
-		}
-		
-		if (item != null)
-		{
-			// Notify to scripts
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor);
-		}
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -571,7 +572,7 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
 		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
@@ -584,11 +585,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -634,7 +636,7 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
 		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
@@ -647,12 +649,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
 		
-		return item;
+		return droppedItem;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 23485ce609..ba5cfe3e61 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -177,15 +177,16 @@ public class QuestState
 	/**
 	 * Add parameter used in quests.
 	 * @param var String pointing out the name of the variable for quest
-	 * @param value String pointing out the value of the variable for quest
+	 * @param val String pointing out the value of the variable for quest
 	 */
-	public void setInternal(String var, String value)
+	public void setInternal(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
@@ -211,15 +212,16 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/BaseStat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
index 5bea0d551b..f484368bcf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
@@ -78,15 +78,16 @@ public enum BaseStat
 	
 	public static BaseStat valueOfXml(String name)
 	{
-		name = name.intern();
+		final String internName = name.intern();
 		for (BaseStat s : values())
 		{
-			if (s.getValue().equalsIgnoreCase(name))
+			if (s.getValue().equalsIgnoreCase(internName))
 			{
 				return s;
 			}
 		}
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 	
 	protected static final class STR implements IBaseStatFunction
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 2d6ec47674..aec2839e45 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1921,8 +1921,8 @@ public class Formulas
 	public static boolean calcCancelSuccess(BuffInfo info, int cancelMagicLvl, int rate, Skill skill)
 	{
 		// Lvl Bonus Modifier.
-		rate *= info.getSkill().getMagicLevel() > 0 ? 1 + ((cancelMagicLvl - info.getSkill().getMagicLevel()) / 100.) : 1;
-		return Rnd.get(100) < Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
+		final int chance = (int) (rate * (info.getSkill().getMagicLevel() > 0 ? 1 + ((cancelMagicLvl - info.getSkill().getMagicLevel()) / 100.) : 1));
+		return Rnd.get(100) < Util.constrain(chance, skill.getMinChance(), skill.getMaxChance());
 	}
 	
 	/**
@@ -1996,7 +1996,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (exp > 0) // Received exp
 		{
-			exp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(exp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(exp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Stat.java
index c2da337c21..9a696208e0 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -211,15 +211,15 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 47957caa25..14e5c8f4a1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.l2jmobius.commons.network.PacketWriter;
@@ -40,13 +41,11 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_objectId = creature.getObjectId();
 		_skillId = skillId;
 		_skillLevel = skillLevel;
-		
-		//@formatter:off
 		if (targets == null)
 		{
-			targets = new WorldObject[] { creature };
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		//@formatter:on
 		_targets = Arrays.asList(targets);
 	}
 	
@@ -59,6 +58,7 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet);
+		
 		packet.writeD(_objectId);
 		packet.writeD(_skillId);
 		packet.writeD(_skillLevel);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index d73018ea1f..6e8d0066fe 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -148,16 +148,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index da641dde8d..12d1e6d81b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -73,10 +73,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -89,11 +90,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 226310ca0a..add0f1361e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
index 6dbb62c92e..390ab57d68 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -112,10 +112,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -145,8 +146,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 609edbec64..3a62403523 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -149,7 +149,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -158,9 +158,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
@@ -231,7 +231,7 @@ public class HtmlUtil
 		return createPage(Arrays.asList(elements), elements.length, page, elementsPerPage, pagerFunction, bodyFunction);
 	}
 	
-	public static <T> PageResult createPage(Iterable<T> elements, int size, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
+	public static <T> PageResult createPage(Iterable<T> elements, int size, int pageValue, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
 	{
 		int pages = size / elementsPerPage;
 		if ((elementsPerPage * pages) < size)
@@ -256,6 +256,7 @@ public class HtmlUtil
 			}
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
index 8ecd9bbd9d..d0b4c3d186 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Util.java
@@ -99,11 +99,7 @@ public class Util
 	
 	public static int convertDegreeToClientHeading(double degree)
 	{
-		if (degree < 0)
-		{
-			degree += 360;
-		}
-		return (int) (degree * 182.044444444);
+		return (int) ((degree < 0 ? degree + 360 : degree) * 182.044444444);
 	}
 	
 	public static int calculateHeadingFrom(ILocational from, ILocational to)
@@ -687,15 +683,17 @@ public class Util
 		{
 			return "now";
 		}
-		time = Math.abs(time);
+		
+		int remaining = Math.abs(time);
 		String ret = "";
-		final long numDays = time / 86400;
-		time -= numDays * 86400;
-		final long numHours = time / 3600;
-		time -= numHours * 3600;
-		final long numMins = time / 60;
-		time -= numMins * 60;
-		final long numSeconds = time;
+		final long numDays = remaining / 86400;
+		remaining -= numDays * 86400;
+		final long numHours = remaining / 3600;
+		remaining -= numHours * 3600;
+		final long numMins = remaining / 60;
+		remaining -= numMins * 60;
+		final long numSeconds = remaining;
+		
 		if (numDays > 0)
 		{
 			ret += numDays + "d ";
@@ -712,6 +710,7 @@ public class Util
 		{
 			ret += numSeconds + "s";
 		}
+		
 		return ret.trim();
 	}
 	
@@ -862,8 +861,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -877,8 +875,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -892,8 +889,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 9f8e32cb26..333643b0b7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -187,12 +187,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index b6fb30b20e..9ee155e0e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -321,7 +321,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getLocalizedMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getLocalizedMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_CT_2.6_HighFive/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
index 1ff7451e39..5e62b82534 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -55,13 +55,9 @@ public class Bernarde extends AbstractNpcAI
 					&& (player.getInventory().getInventoryItemCount(DARION_BADGE, -1, false) >= 5) //
 					&& player.exchangeItemsById("Quest", npc, DARION_BADGE, 5, HOLY_WATER, 1, true))
 				{
-					event = "32300-02b.htm";
+					return "32300-02b.htm";
 				}
-				else
-				{
-					event = "32300-02c.htm";
-				}
-				break;
+				return "32300-02c.htm";
 			}
 			case "Treasure":
 			{
@@ -71,13 +67,11 @@ public class Bernarde extends AbstractNpcAI
 					takeItems(player, TREASURE, -1);
 					return "32300-02d.htm";
 				}
-				event = "32300-02e.htm";
-				break;
+				return "32300-02e.htm";
 			}
 			case "rumors":
 			{
-				event = "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
-				break;
+				return "32300-" + HellboundEngine.getInstance().getLevel() + "r.htm";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
index 66f69e319a..4a965ae472 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/IsleOfPrayer/DarkWaterDragon.java
@@ -106,11 +106,12 @@ public class DarkWaterDragon extends AbstractNpcAI
 				cancelQuestTimer("2", npc, null);
 				cancelQuestTimer("3", npc, null);
 				cancelQuestTimer("4", npc, null);
+				
 				MY_TRACKING_SET.remove(npc.getObjectId());
-				player = ID_MAP.remove(npc.getObjectId());
-				if (player != null)
+				final PlayerInstance removed = ID_MAP.remove(npc.getObjectId());
+				if (removed != null)
 				{
-					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), player);
+					((Attackable) npc).doItemDrop(NpcData.getInstance().getTemplate(18485), removed);
 				}
 				
 				npc.deleteMe();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
index b8a6287f61..c04b3996fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java
@@ -359,6 +359,7 @@ public class Beleth extends AbstractNpcAI
 			{
 				_minions.clear();
 				
+				Npc spawn;
 				int a = 0;
 				for (int i = 0; i < 16; i++)
 				{
@@ -366,12 +367,12 @@ public class Beleth extends AbstractNpcAI
 					
 					final int x = (int) ((650 * Math.cos(i * 0.39)) + 16323);
 					final int y = (int) ((650 * Math.sin(i * 0.39)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(x, y, -9357, 49152));
+					_minions.add(spawn);
 					
 					if (a >= 2)
 					{
-						npc.setOverloaded(true);
+						spawn.setOverloaded(true);
 						a = 0;
 					}
 				}
@@ -382,33 +383,31 @@ public class Beleth extends AbstractNpcAI
 				{
 					xm[i] = (int) ((1700 * Math.cos((i * 1.57) + 0.78)) + 16323);
 					ym[i] = (int) ((1700 * Math.sin((i * 1.57) + 0.78)) + 213170);
-					npc = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
-					npc.setImmobilized(true);
-					
-					_minions.add(npc);
+					spawn = addSpawn(FAKE_BELETH, new Location(xm[i], ym[i], -9357, 49152));
+					spawn.setImmobilized(true);
+					_minions.add(spawn);
 				}
 				
 				xm[4] = (xm[0] + xm[1]) / 2;
 				ym[4] = (ym[0] + ym[1]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[4], ym[4], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[5] = (xm[1] + xm[2]) / 2;
 				ym[5] = (ym[1] + ym[2]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[5], ym[5], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[6] = (xm[2] + xm[3]) / 2;
 				ym[6] = (ym[2] + ym[3]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[6], ym[6], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[7] = (xm[3] + xm[0]) / 2;
 				ym[7] = (ym[3] + ym[0]) / 2;
-				npc = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
-				npc.setImmobilized(true);
-				_minions.add(npc);
-				
+				spawn = addSpawn(FAKE_BELETH, new Location(xm[7], ym[7], -9357, 49152));
+				spawn.setImmobilized(true);
+				_minions.add(spawn);
 				xm[8] = (xm[0] + xm[4]) / 2;
 				ym[8] = (ym[0] + ym[4]) / 2;
 				_minions.add(addSpawn(FAKE_BELETH, new Location(xm[8], ym[8], -9357, 49152)));
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
index 5d9135ddda..7c7dc19539 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/Survivor/Survivor.java
@@ -50,7 +50,7 @@ public class Survivor extends AbstractNpcAI
 		{
 			if (player.getLevel() < MIN_LEVEL)
 			{
-				event = "32632-3.htm";
+				return "32632-3.htm";
 			}
 			else if (player.getAdena() < 150000)
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index de7069f968..a987068947 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -919,8 +919,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
 		{
 			_nextSiege.cancel(true);
 		}
-		date -= 3600000;
-		setRegistrationEndString(date);
+		setRegistrationEndString(date - 3600000);
 		_nextSiege = ThreadPool.schedule(new SetFinalAttackers(), _rainbow.getNextSiegeTime());
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index be31a3c1ca..d1f6a0580d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -57,8 +57,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_getbuffs"))
 		{
 			final StringTokenizer st = new StringTokenizer(command, " ");
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 35363d4369..389ee5aee4 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -993,8 +993,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 4c95826d26..3d34f6c282 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -101,8 +101,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index bd1d70c6e0..19b6326030 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -159,10 +159,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -176,7 +176,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -290,7 +290,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage();
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -320,7 +320,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -333,7 +333,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			((MonsterInstance) npc1).deleteMe();
 			((MonsterInstance) npc2).deleteMe();
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index 2ee50e9848..12d742787f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -51,8 +51,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index e3d5c09a11..1750693f1d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
index debe367ff2..80c5f0ee43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSiege.java
@@ -69,8 +69,9 @@ public class AdminSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 6a7d743c24..a79389fce8 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -82,8 +82,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -277,9 +278,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -297,6 +298,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index 065c720f50..44ad100169 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -470,7 +470,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -479,6 +479,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		NpcTemplate template;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -503,6 +504,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.getInstanceId() > 0)
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
index e16d083615..fb49e9ebe3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java
@@ -44,8 +44,9 @@ public class AdminTerritoryWar implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		command = st.nextToken();
 		if (command.equals("admin_territory_war"))
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 1344b89391..acd832be08 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -224,7 +224,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -249,6 +249,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
index 9a73b58216..1429e1075d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java
@@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler
 		return false;
 	}
 	
-	public static void tryRentPet(PlayerInstance player, int value)
+	public static void tryRentPet(PlayerInstance player, int petValue)
 	{
 		if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped())
 		{
@@ -106,6 +106,7 @@ public class RentPet implements IBypassHandler
 			1800
 		};
 		
+		int value = petValue;
 		if (value > 10)
 		{
 			petId = 12526;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 90fe1927fe..392a0ee723 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -42,7 +42,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -50,6 +50,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 753536adc8..8eb9eaf693 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
index b6ff96a481..1075ce5408 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java
@@ -36,8 +36,8 @@ public class AreaSummon implements ITargetTypeHandler
 	public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target)
 	{
 		final List<Creature> targetList = new ArrayList<>();
-		target = creature.getSummon();
-		if ((target == null) || !target.isServitor() || target.isDead())
+		final Creature targetCreature = creature.getSummon();
+		if ((targetCreature == null) || !targetCreature.isServitor() || targetCreature.isDead())
 		{
 			return EMPTY_TARGET_LIST;
 		}
@@ -46,13 +46,13 @@ public class AreaSummon implements ITargetTypeHandler
 		{
 			return new Creature[]
 			{
-				target
+				targetCreature
 			};
 		}
 		
 		final boolean srcInArena = (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE));
 		final int maxTargets = skill.getAffectLimit();
-		World.getInstance().forEachVisibleObjectInRange(target, Creature.class, skill.getAffectRange(), obj ->
+		World.getInstance().forEachVisibleObjectInRange(targetCreature, Creature.class, skill.getAffectRange(), obj ->
 		{
 			if (obj == creature)
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
index d02ed7a37b..54c96baaca 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -383,30 +383,32 @@ public class Q00384_WarehouseKeepersPastime extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num, int npcId)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
index 7e3b1b130e..8748ed4d6e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -320,30 +320,32 @@ public class Q00386_StolenDignity extends Quest
 	
 	private String fillBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
 			if (isSelectedBingoNumber(qs, i1))
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 			}
 			else
 			{
-				html = html.replace("<?Cell" + (i0 + 1) + "?>", "?");
+				result = result.replace("<?Cell" + (i0 + 1) + "?>", "?");
 			}
 		}
-		return html;
+		return result;
 	}
 	
 	private String colorBoard(QuestState qs, String html)
 	{
+		String result = html;
 		for (int i0 = 0; i0 < 9; i0 += 1)
 		{
 			final int i1 = getNumberFromBingoBoard(qs, i0);
-			html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
-			html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
+			result = result.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
+			result = result.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
 		}
-		return html;
+		return result;
 	}
 	
 	private String beforeReward(PlayerInstance player, QuestState qs, int num)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index d857b6e650..9070c5b7f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -260,7 +260,7 @@ public class Q00511_AwlUnderFoot extends Quest
 		return null;
 	}
 	
-	protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String ret)
+	protected String enterInstance(PlayerInstance player, int[] coords, FortDungeon dungeon, String retValue)
 	{
 		// check for existing instances for this player
 		InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
@@ -275,16 +275,19 @@ public class Q00511_AwlUnderFoot extends Quest
 			teleportPlayer(player, coords, world.getInstanceId());
 			return "";
 		}
+		
 		// New instance
+		if (retValue != null)
+		{
+			return retValue;
+		}
+		
+		final String ret = checkConditions(player);
 		if (ret != null)
 		{
 			return ret;
 		}
-		ret = checkConditions(player);
-		if (ret != null)
-		{
-			return ret;
-		}
+		
 		final Party party = player.getParty();
 		world = new FAUWorld();
 		final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
index a99ce70ea2..6171ba6feb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -341,8 +341,9 @@ public class Q00660_AidingTheFloranVillage extends Quest
 		return htmltext;
 	}
 	
-	private void tradeItems(PlayerInstance player, long required, long itemCount1, long itemCount2, long itemCount3)
+	private void tradeItems(PlayerInstance player, long requiredValue, long itemCount1, long itemCount2, long itemCount3)
 	{
+		long required = requiredValue;
 		if (itemCount1 < required)
 		{
 			takeItems(player, WATCHING_EYES, itemCount1);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
index f924b7d769..a1b19ad874 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java
@@ -238,7 +238,7 @@ public class Q00726_LightWithinTheDarkness extends Quest
 		return null;
 	}
 	
-	protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String ret)
+	protected String enterInstance(PlayerInstance player, String template, int[] coords, FortDungeon dungeon, String retValue)
 	{
 		InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
 		if (world != null)
@@ -252,15 +252,17 @@ public class Q00726_LightWithinTheDarkness extends Quest
 			return "";
 		}
 		
+		if (retValue != null)
+		{
+			return retValue;
+		}
+		
+		final String ret = checkConditions(player);
 		if (ret != null)
 		{
 			return ret;
 		}
-		ret = checkConditions(player);
-		if (ret != null)
-		{
-			return ret;
-		}
+		
 		final Party party = player.getParty();
 		world = new PAWORLD();
 		final Instance instance = InstanceManager.getInstance().createDynamicInstance(dungeon.getInstanceId());
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 1633ca260d..0d557c32c9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -101,13 +101,9 @@ public class Q10272_LightFragment extends Quest
 				if (getQuestItemsCount(player, Inventory.ADENA_ID) >= 10000)
 				{
 					takeItems(player, Inventory.ADENA_ID, 10000);
-					event = "32566-05.html";
+					return "32566-05.html";
 				}
-				else
-				{
-					event = "32566-04a.html";
-				}
-				break;
+				return "32566-04a.html";
 			}
 			case "32567-04.html":
 			{
@@ -128,7 +124,7 @@ public class Q10272_LightFragment extends Quest
 				}
 				else
 				{
-					event = "32557-04.html";
+					return "32557-04.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index 3df6603c8f..8149fb5043 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -93,7 +93,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 90339f6c85..e142c280fb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -112,7 +112,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
index 35fd281f12..681d6bf01a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java
@@ -499,9 +499,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java
index 1a67dc0bf9..bfd8ca71d3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java
@@ -1980,10 +1980,10 @@ public class SevenSignsFestival implements SpawnListener
 		 * Returns the running instance of a festival for the given Oracle and festivalID.<br>
 		 * A <b>null</b> value is returned if there are no participants in that festival.
 		 * @param oracle
-		 * @param festivalId
+		 * @param festivalIdValue
 		 * @return DarknessFestival festivalInst
 		 */
-		public DarknessFestival getFestivalInstance(int oracle, int festivalId)
+		public DarknessFestival getFestivalInstance(int oracle, int festivalIdValue)
 		{
 			if (!_festivalInitialized)
 			{
@@ -1994,6 +1994,7 @@ public class SevenSignsFestival implements SpawnListener
 			 * Compute the offset if a Dusk instance is required. ID: 0 1 2 3 4 Dusk 1:1011121314 Dawn 2:2021222324
 			 */
 			
+			int festivalId = festivalIdValue;
 			festivalId += (oracle == SevenSigns.CABAL_DUSK) ? 10 : 20;
 			return _festivalInstances.get(festivalId);
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java
index 79aa571e91..9c89c5a7bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java
@@ -101,11 +101,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 5ea2d3dcf3..82f2442e2c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -485,13 +485,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index cbf0a1b623..df5626a904 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -325,13 +325,14 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
@@ -359,7 +360,6 @@ public class AttackableAI extends CreatureAI
 				
 				// Cancel the AI
 				_actor.detachAI();
-				
 				return;
 			}
 		}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index d44b9d7eb8..8f3de5d807 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -994,10 +994,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -1005,12 +1005,12 @@ public class CreatureAI extends AbstractAI
 			// LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1057,6 +1057,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
index 01975ffd18..245c25a3bf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
@@ -152,27 +152,30 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target.isSummon())
+		Creature currentTarget = target;
+		if (currentTarget.isSummon())
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius3D(owner, 1000))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
-		return (!target.isPlayable() || !((Playable) target).isSilentMovingAffected() || _actor.isInsideRadius2D(target, 250)) && _actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target);
+		
+		return (!currentTarget.isPlayable() || !((Playable) currentTarget).isSilentMovingAffected() || _actor.isInsideRadius2D(currentTarget, 250)) && _actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget);
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
 			// Check if actor is not dead
@@ -728,8 +731,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -780,8 +782,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
index 4fffd55c7c..1eb651afe5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
@@ -137,35 +137,37 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 		}
 		
 		// Get the owner if the target is a summon
-		if (target.isSummon())
+		Creature currentTarget = target;
+		if (currentTarget.isSummon())
 		{
-			final PlayerInstance owner = ((Summon) target).getOwner();
+			final PlayerInstance owner = ((Summon) currentTarget).getOwner();
 			if (_actor.isInsideRadius3D(owner, 1000))
 			{
-				target = owner;
+				currentTarget = owner;
 			}
 		}
 		
 		// Check if the target isn't in silent move mode AND too far (>100)
-		if (target.isPlayable() && ((Playable) target).isSilentMovingAffected() && !_actor.isInsideRadius2D(target, 250))
+		if (currentTarget.isPlayable() && ((Playable) currentTarget).isSilentMovingAffected() && !_actor.isInsideRadius2D(currentTarget, 250))
 		{
 			return false;
 		}
 		
 		// Los Check Here
-		return (_actor.isAutoAttackable(target) && GeoEngine.getInstance().canSeeTarget(_actor, target));
+		return (_actor.isAutoAttackable(currentTarget) && GeoEngine.getInstance().canSeeTarget(_actor, currentTarget));
 	}
 	
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param arg0 The first parameter of the Intention
 	 * @param arg1 The second parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
+	synchronized void changeIntention(CtrlIntention newIntention, Object arg0, Object arg1)
 	{
+		CtrlIntention intention = newIntention;
 		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
 		{
 			// Check if actor is not dead
@@ -198,7 +200,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 				
 				// Cancel the AI
 				_actor.detachAI();
-				
 				return;
 			}
 		}
@@ -731,8 +732,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 			me.addDamageHate(target, 0, aggro);
 			
 			// Get the hate of the actor against the target
-			aggro = me.getHating(target);
-			if (aggro <= 0)
+			if (me.getHating(target) <= 0)
 			{
 				if (me.getMostHated() == null)
 				{
@@ -783,8 +783,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 				me.addDamageHate(aggroed, 0, aggro);
 			}
 			
-			aggro = me.getHating(mostHated);
-			if (aggro <= 0)
+			if (me.getHating(mostHated) <= 0)
 			{
 				_globalAggro = -25;
 				me.clearAggroList();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index bdd3cbf6ad..d3e97f8764 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -155,8 +155,9 @@ public class MultisellData implements IXmlReader
 		return NUMERIC_FILTER;
 	}
 	
-	private final Entry parseEntry(Node n, int entryId, ListContainer list)
+	private final Entry parseEntry(Node node, int entryId, ListContainer list)
 	{
+		Node n = node;
 		final Node first = n.getFirstChild();
 		final Entry entry = new Entry(entryId);
 		NamedNodeMap attrs;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index e86ae2263b..6e55d0fb02 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -343,10 +343,11 @@ public class SkillTreeData implements IXmlReader
 		skillTree.putAll(_commonSkillTree);
 		
 		final LinkedList<ClassId> classSequence = new LinkedList<>();
-		while (classId != null)
+		ClassId currentClassId = classId;
+		while (currentClassId != null)
 		{
-			classSequence.addFirst(classId);
-			classId = _parentClassMap.get(classId);
+			classSequence.addFirst(currentClassId);
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		
 		for (ClassId cid : classSequence)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/AugmentationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
index eb8cb5483b..349719469b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/AugmentationData.java
@@ -510,7 +510,7 @@ public class AugmentationData
 		}
 	}
 	
-	private Augmentation generateRandomWeaponAugmentation(int lifeStoneLevel, int lifeStoneGrade, int lifeStoneId, ItemInstance item)
+	private Augmentation generateRandomWeaponAugmentation(int level, int lifeStoneGrade, int lifeStoneId, ItemInstance item)
 	{
 		int stat12 = 0;
 		int stat34 = 0;
@@ -709,7 +709,7 @@ public class AugmentationData
 		boolean generateGlow = false;
 		
 		// life stone level is used for stat Id and skill level, but here the max level is 9
-		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		int lifeStoneLevel = Math.min(level, 9);
 		
 		switch (lifeStoneGrade)
 		{
@@ -883,7 +883,7 @@ public class AugmentationData
 		return new Augmentation(((stat34 << 16) + stat12));
 	}
 	
-	private Augmentation generateRandomAccessoryAugmentation(int lifeStoneLevel, int bodyPart, int lifeStoneId)
+	private Augmentation generateRandomAccessoryAugmentation(int level, int bodyPart, int lifeStoneId)
 	{
 		int stat12 = 0;
 		int stat34 = 0;
@@ -952,7 +952,7 @@ public class AugmentationData
 			}
 			return new Augmentation(((stat34 << 16) + stat12));
 		}
-		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		int lifeStoneLevel = Math.min(level, 9);
 		int base = 0;
 		int skillsLength = 0;
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 775d80249e..04fff3ee19 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -184,19 +184,20 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
-		parseTemplate(n, template, null);
+		parseTemplate(node, template, null);
 	}
 	
-	protected void parseTemplate(Node n, Object template, EffectScope effectScope)
+	protected void parseTemplate(Node node, Object template, EffectScope effectScope)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -332,13 +333,14 @@ public abstract class DocumentBase
 	
 	/**
 	 * Parse effect's parameters.
-	 * @param n the node to start the parsing
+	 * @param node the node to start the parsing
 	 * @param template the effect template
 	 * @return the list of parameters if any, {@code null} otherwise
 	 */
-	private StatSet parseParameters(Node n, Object template)
+	private StatSet parseParameters(Node node, Object template)
 	{
 		StatSet parameters = null;
+		Node n = node;
 		while ((n != null))
 		{
 			// Parse all parameters.
@@ -360,8 +362,9 @@ public abstract class DocumentBase
 		return parameters == null ? StatSet.EMPTY_STATSET : parameters;
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -409,12 +412,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -429,9 +434,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -446,8 +452,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index 49f979e5f9..9f5e753dd2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -93,8 +93,9 @@ public class DocumentItem extends DocumentBase
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
index 83c391e630..fc7159d4bd 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/skills/DocumentSkill.java
@@ -116,8 +116,9 @@ public class DocumentSkill extends DocumentBase
 		}
 	}
 	
-	protected void parseSkill(Node n)
+	protected void parseSkill(Node node)
 	{
+		Node n = node;
 		final NamedNodeMap attrs = n.getAttributes();
 		int enchantLevels1 = 0;
 		int enchantLevels2 = 0;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index e4c0d434dd..f29d691613 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -484,19 +484,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instanceId
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, int instanceId)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, int instanceId)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index 8601662f15..09c482a29a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -166,10 +166,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -179,6 +179,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TelnetHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
index a6a82cf11b..ea9ce3e7f9 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/handler/TelnetHandler.java
@@ -50,8 +50,9 @@ public class TelnetHandler implements IHandler<ITelnetHandler, String>
 	}
 	
 	@Override
-	public ITelnetHandler getHandler(String command)
+	public ITelnetHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index ba37026cbd..eef29baa34 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -64,13 +64,14 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastleIndex(obj, Long.MAX_VALUE);
 	}
 	
-	public int findNearestCastleIndex(WorldObject obj, long maxDistance)
+	public int findNearestCastleIndex(WorldObject obj, long maxDistanceValue)
 	{
 		int index = getCastleIndex(obj);
 		if (index < 0)
 		{
-			double distance;
 			Castle castle;
+			double distance;
+			long maxDistance = maxDistanceValue;
 			for (int i = 0; i < _castles.size(); i++)
 			{
 				castle = _castles.get(i);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index 20003ebc1a..5e81274b2e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -41,13 +41,14 @@ public class FortManager implements InstanceListManager
 		return findNearestFortIndex(obj, Long.MAX_VALUE);
 	}
 	
-	public int findNearestFortIndex(WorldObject obj, long maxDistance)
+	public int findNearestFortIndex(WorldObject obj, long maxDistanceValue)
 	{
 		int index = getFortIndex(obj);
 		if (index < 0)
 		{
-			double distance;
 			Fort fort;
+			double distance;
+			long maxDistance = maxDistanceValue;
 			for (int i = 0; i < _forts.size(); i++)
 			{
 				fort = _forts.get(i);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
index d20b15038c..7f308a3505 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java
@@ -1367,8 +1367,9 @@ public class FourSepulchersManager
 		}
 	}
 	
-	protected byte minuteSelect(byte min)
+	protected byte minuteSelect(byte value)
 	{
+		byte min = value;
 		if ((min % 5) != 0) // if doesn't divides on 5 fully
 		{
 			// mad table for selecting proper minutes...
@@ -1466,17 +1467,17 @@ public class FourSepulchersManager
 		return min;
 	}
 	
-	public void managerSay(byte min)
+	public void managerSay(byte value)
 	{
 		// for attack phase, sending message every 5 minutes
 		if (_inAttackTime)
 		{
-			if (min < 5)
+			if (value < 5)
 			{
 				return; // do not shout when < 5 minutes
 			}
 			
-			min = minuteSelect(min);
+			final byte min = minuteSelect(value);
 			NpcStringId msg = NpcStringId.MINUTE_S_HAVE_PASSED;
 			if (min == 90)
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
index 2faf13199d..c014787c05 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
@@ -392,18 +392,20 @@ public class Lottery
 		}
 	}
 	
-	public int[] decodeNumbers(int enchant, int type2)
+	public int[] decodeNumbers(int enchantValue, int type2Value)
 	{
 		final int[] res = new int[5];
 		int id = 0;
 		int nr = 1;
 		
+		int enchant = enchantValue;
 		while (enchant > 0)
 		{
 			final int val = enchant / 2;
-			if (val != Math.round((double) enchant / 2))
+			if (val != ((double) enchant / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			enchant /= 2;
 			nr++;
@@ -411,12 +413,14 @@ public class Lottery
 		
 		nr = 17;
 		
+		int type2 = type2Value;
 		while (type2 > 0)
 		{
 			final int val = type2 / 2;
 			if (val != ((double) type2 / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			type2 /= 2;
 			nr++;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
index f9d9eb88e0..3804282ce2 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AutoSpawnHandler.java
@@ -168,22 +168,7 @@ public class AutoSpawnHandler
 	 */
 	public AutoSpawnInstance registerSpawn(int npcId, int[][] spawnPoints, int initialDelay, int respawnDelay, int despawnDelay)
 	{
-		if (initialDelay < 0)
-		{
-			initialDelay = DEFAULT_INITIAL_SPAWN;
-		}
-		
-		if (respawnDelay < 0)
-		{
-			respawnDelay = DEFAULT_RESPAWN;
-		}
-		
-		if (despawnDelay < 0)
-		{
-			despawnDelay = DEFAULT_DESPAWN;
-		}
-		
-		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay);
+		final AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay < 0 ? DEFAULT_INITIAL_SPAWN : initialDelay, respawnDelay < 0 ? DEFAULT_RESPAWN : respawnDelay, despawnDelay < 0 ? DEFAULT_DESPAWN : despawnDelay);
 		if (spawnPoints != null)
 		{
 			for (int[] spawnPoint : spawnPoints)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
index 6a3acef21b..3632d6aad6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Party.java
@@ -725,18 +725,18 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param partyDmg
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, long partyDmg, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, long partyDmg, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size());
-		spReward *= getSpBonus(validMembers.size());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size());
+		double spReward = spRewardValue * getSpBonus(validMembers.size());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java
index b74dfcb361..0032035354 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
index 45fea8fce1..26bf09c73d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -189,25 +189,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -515,24 +518,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 2a69979c47..1fd1e44a76 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -646,9 +646,9 @@ public class Attackable extends Npc
 	 * Adds damage and hate to the attacker aggression list for this character.
 	 * @param attacker The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature attacker, int damage, int aggroValue)
 	{
 		if ((attacker == null) || (attacker == this))
 		{
@@ -668,6 +668,7 @@ public class Attackable extends Npc
 		// Traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		final PlayerInstance targetPlayer = attacker.getActingPlayer();
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
@@ -725,8 +726,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
@@ -768,6 +768,7 @@ public class Attackable extends Npc
 		{
 			return;
 		}
+		
 		final AggroInfo ai = _aggroList.get(target);
 		if (ai != null)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 85a4498524..89fc701b4c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -657,15 +657,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
 	 * @param instanceId
 	 * @param randomOffset
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, int instanceId, int randomOffset)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, int instanceId, int randomOffset)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		
 		setInstanceId(instanceId);
 		
 		if (_isPendingRevive)
@@ -1524,11 +1529,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		beginCast(skill, true, target, targets);
 	}
 	
-	private void beginCast(Skill skill, boolean simultaneously)
+	private void beginCast(Skill skill, boolean isSimultaneous)
 	{
 		if (!checkDoCastConditions(skill))
 		{
-			if (simultaneously)
+			if (isSimultaneous)
 			{
 				setCastingSimultaneouslyNow(false);
 			}
@@ -1544,6 +1549,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Override casting type
+		boolean simultaneously = isSimultaneous;
 		if (skill.isSimultaneousCast() && !simultaneously)
 		{
 			simultaneously = true;
@@ -1624,6 +1630,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				}
 			}
 		}
+		
 		beginCast(skill, simultaneously, target, targets);
 	}
 	
@@ -4119,9 +4126,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -4170,12 +4177,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -4184,6 +4191,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -4641,13 +4653,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>if attack isn't aborted and hit isn't missed, manage attack or cast break of the target (calculating rate, sending message...)</li>
 	 * </ul>
 	 * @param target The Creature targeted
-	 * @param damage Number of HP to reduce
+	 * @param damageValue Number of HP to reduce
 	 * @param crit True if hit is critical
 	 * @param miss True if hit is missed
 	 * @param soulshot True if SoulShot are charged
 	 * @param shld True if shield is efficient
 	 */
-	public void onHitTimer(Creature target, int damage, boolean crit, boolean miss, boolean soulshot, byte shld)
+	public void onHitTimer(Creature target, int damageValue, boolean crit, boolean miss, boolean soulshot, byte shld)
 	{
 		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
 		// and send a Server->Client packet ActionFailed (if attacker is a PlayerInstance)
@@ -4690,6 +4702,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// Send message about damage/crit or miss
+		int damage = damageValue;
 		sendDamageMessage(target, damage, false, crit, miss);
 		
 		// Check Raidboss attack Creature will be petrified if attacking a raid that's more than 8 levels lower
@@ -6293,6 +6306,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			{
 				return;
 			}
+			
 			if (skill.checkCondition(this, target, false))
 			{
 				if (isSkillDisabled(skill))
@@ -6313,25 +6327,26 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					return;
 				}
 				
+				Creature skillTarget = target;
 				for (WorldObject obj : targets)
 				{
 					if ((obj != null) && obj.isCreature())
 					{
-						target = (Creature) obj;
+						skillTarget = (Creature) obj;
 						break;
 					}
 				}
 				
-				if (Config.ALT_VALIDATE_TRIGGER_SKILLS && isPlayable() && (target != null) && target.isPlayable())
+				if (Config.ALT_VALIDATE_TRIGGER_SKILLS && isPlayable() && (skillTarget != null) && skillTarget.isPlayable())
 				{
 					final PlayerInstance player = getActingPlayer();
-					if (!player.checkPvpSkill(target, skill))
+					if (!player.checkPvpSkill(skillTarget, skill))
 					{
 						return;
 					}
 				}
 				
-				broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+				broadcastPacket(new MagicSkillUse(this, skillTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				broadcastPacket(new MagicSkillLaunched(this, skill.getDisplayId(), skill.getLevel(), targets));
 				
 				// Launch the magic skill and calculate its effects
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
index 14464a962f..8c89b4d45a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java
@@ -770,8 +770,7 @@ public class Npc extends Creature
 	public void insertObjectIdAndShowChatWindow(PlayerInstance player, String content)
 	{
 		// Send a Server->Client packet NpcHtmlMessage to the PlayerInstance in order to display the message of the NpcInstance
-		content = content.replaceAll("%objectId%", String.valueOf(getObjectId()));
-		player.sendPacket(new NpcHtmlMessage(getObjectId(), content));
+		player.sendPacket(new NpcHtmlMessage(getObjectId(), content.replaceAll("%objectId%", String.valueOf(getObjectId()))));
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index b6660dfa22..97f4b7382d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -114,8 +114,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index 6d70f70cba..5da0700f83 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -143,13 +143,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -207,6 +208,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index b3a54d3198..c4f3f3e929 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -790,19 +790,18 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
-		if (dropit == null)
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
+		if (dropit != null)
 		{
-			return;
+			if (protect)
+			{
+				dropit.getDropProtection().protect(getOwner());
+			}
+			LOGGER_PET.finer("Item id to drop: " + dropit.getId() + " amount: " + dropit.getCount());
+			dropit.dropMe(this, getX(), getY(), getZ() + 100);
 		}
-		if (protect)
-		{
-			dropit.getDropProtection().protect(getOwner());
-		}
-		LOGGER_PET.finer("Item id to drop: " + dropit.getId() + " amount: " + dropit.getCount());
-		dropit.dropMe(this, getX(), getY(), getZ() + 100);
 	}
 	
 	public void dropItemHere(ItemInstance dropit)
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0f22c245d0..b01cc89715 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1955,13 +1955,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the Karma of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param karma
+	 * @param value
 	 */
 	@Override
-	public void setKarma(int karma)
+	public void setKarma(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerKarmaChanged(this, getKarma(), karma), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerKarmaChanged(this, getKarma(), value), this);
+		
+		int karma = value;
 		if (karma < 0)
 		{
 			karma = 0;
@@ -2668,12 +2670,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2720,12 +2717,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3372,8 +3364,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3386,7 +3378,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -3406,13 +3398,13 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				sm = new SystemMessage(SystemMessageId.S2_S1_HAS_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 			}
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 			}
 			sendPacket(sm);
 		}
@@ -3673,8 +3665,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3683,33 +3675,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(!(!item.isEquipable() || (item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM)));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendPacket(playerIU);
 		}
 		else
@@ -3726,7 +3718,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4714,11 +4706,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer());
@@ -7994,23 +7987,21 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		slot--;
-		
-		final Henna henna = _henna[slot];
+		final Henna henna = _henna[slot - 1];
 		if (henna == null)
 		{
 			return false;
 		}
 		
-		_henna[slot] = null;
+		_henna[slot - 1] = null;
 		
 		try (Connection con = DatabaseFactory.getConnection();
-			PreparedStatement ps = con.prepareStatement(DELETE_CHAR_HENNA))
+			PreparedStatement statement = con.prepareStatement(DELETE_CHAR_HENNA))
 		{
-			ps.setInt(1, getObjectId());
-			ps.setInt(2, slot + 1);
-			ps.setInt(3, _classIndex);
-			ps.execute();
+			statement.setInt(1, getObjectId());
+			statement.setInt(2, slot);
+			statement.setInt(3, _classIndex);
+			statement.execute();
 		}
 		catch (Exception e)
 		{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index 9e75e49593..ab59afb4e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
index a0b4f9b7ed..28a81dc2cc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java
@@ -223,11 +223,12 @@ public class SepulcherNpcInstance extends Npc
 			{
 				setInvul(false);
 				reduceCurrentHp(getMaxHp() + 1, player, null);
+				PlayerInstance leader = player;
 				if ((player.getParty() != null) && !player.getParty().isLeader(player))
 				{
-					player = player.getParty().getLeader();
+					leader = player.getParty().getLeader();
 				}
-				player.addItem("Quest", HALLS_KEY, 1, player, true);
+				leader.addItem("Quest", HALLS_KEY, 1, leader, true);
 				break;
 			}
 			default:
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index f86a9d7df7..af5c011d8d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -41,19 +41,20 @@ public class PlayableStat extends CreatureStat
 		super(activeChar);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -77,6 +78,7 @@ public class PlayableStat extends CreatureStat
 			level = --tmp;
 			break;
 		}
+		
 		if ((level != getLevel()) && (level >= minimumLevel))
 		{
 			addLevel((byte) (level - getLevel()));
@@ -85,8 +87,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if ((getExp() - value) < 0)
 		{
 			value = getExp() - 1;
@@ -131,8 +134,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -171,19 +175,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -193,14 +199,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index e1721f1487..15e8a15113 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -113,7 +113,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public boolean addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public boolean addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -123,6 +123,9 @@ public class PlayerStat extends PlayableStat
 			return false;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -477,9 +480,10 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
@@ -488,7 +492,7 @@ public class PlayerStat extends PlayableStat
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -727,9 +731,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == _vitalityPoints)
 		{
 			return;
@@ -740,13 +744,14 @@ public class PlayerStat extends PlayableStat
 		getActiveChar().sendPacket(new ExVitalityPointInfo(getVitalityPoints()));
 	}
 	
-	public synchronized void updateVitalityPoints(float points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(float value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		float points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index b13c954689..b150d939f3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -101,7 +101,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -137,27 +138,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getSummon();
 			if (getActiveChar().hasServitor() && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().calcStat(Stat.MANA_SHIELD_PERCENT, 0, null, null)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.MANA_SHIELD_PERCENT, 0, null, null)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -173,7 +174,7 @@ public class PlayerStatus extends PlayableStatus
 			final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
-				int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) value * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100);
+				int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) amount * (int) getActiveChar().getStat().calcStat(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100);
 				if (transferDmg > 0)
 				{
 					int membersInRange = 0;
@@ -201,22 +202,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -252,10 +253,10 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			value = getCurrentHp() - value;
-			if (value <= 0)
+			amount = getCurrentHp() - amount;
+			if (amount <= 0)
 			{
 				if (getActiveChar().isInDuel())
 				{
@@ -271,14 +272,14 @@ public class PlayerStatus extends PlayableStatus
 					
 					// let the DuelManager know of his defeat
 					DuelManager.getInstance().onPlayerDefeat(getActiveChar());
-					value = 1;
+					amount = 1;
 				}
 				else
 				{
-					value = 0;
+					amount = 0;
 				}
 			}
-			setCurrentHp(value);
+			setCurrentHp(amount);
 		}
 		
 		if ((getActiveChar().getCurrentHp() < 0.5) && !isHPConsumption)
@@ -337,7 +338,7 @@ public class PlayerStatus extends PlayableStatus
 		setCurrentCp(newCp, true);
 	}
 	
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -350,11 +351,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 9d5e8f3b8b..7a81967c49 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -108,6 +109,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 6e917e0562..1f7e32ba2a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -868,13 +868,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -884,13 +884,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 55c4b7f8c7..e3a705cf43 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -99,9 +99,9 @@ public class SubClass
 	{
 		if (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -119,13 +119,14 @@ public class SubClass
 	{
 		if (levelValue > MAX_LEVEL)
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 7a18cea0bd..b342b04d3e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1151,8 +1151,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1827,10 +1828,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1907,8 +1908,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1916,18 +1916,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java
index ee11e3cff9..514f121ef1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java
@@ -283,9 +283,10 @@ public class Auction
 	 */
 	private void returnItem(String clanName, long quantity, boolean penalty)
 	{
+		long amount = quantity;
 		if (penalty)
 		{
-			quantity *= 0.9; // take 10% tax fee if needed
+			amount *= 0.9; // take 10% tax fee if needed
 		}
 		
 		final Clan clan = ClanTable.getInstance().getClanByName(clanName);
@@ -304,8 +305,8 @@ public class Auction
 		
 		// avoid overflow on return
 		final long limit = MAX_ADENA - cwh.getAdena();
-		quantity = Math.min(quantity, limit);
-		cwh.addItem("Outbidded", ADENA_ID, quantity, null, null);
+		amount = Math.min(amount, limit);
+		cwh.addItem("Outbidded", ADENA_ID, amount, null, null);
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Castle.java
index 9190fc1f00..254d12e499 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -271,9 +271,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -281,6 +281,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		if (getName().equalsIgnoreCase("Schuttgart") || getName().equalsIgnoreCase("Goddard"))
 		{
 			final Castle rune = CastleManager.getInstance().getCastle("rune");
@@ -314,16 +315,17 @@ public class Castle extends AbstractResidence
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -333,16 +335,13 @@ public class Castle extends AbstractResidence
 			}
 			_treasury -= amount;
 		}
+		else if ((_treasury + amount) > Inventory.MAX_ADENA)
+		{
+			_treasury = Inventory.MAX_ADENA;
+		}
 		else
 		{
-			if ((_treasury + amount) > Inventory.MAX_ADENA)
-			{
-				_treasury = Inventory.MAX_ADENA;
-			}
-			else
-			{
-				_treasury += amount;
-			}
+			_treasury += amount;
 		}
 		
 		try (Connection con = DatabaseFactory.getConnection();
@@ -356,6 +355,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java
index d1d77f7c0b..c3e9f05da5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -186,10 +186,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/NevitSystem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/NevitSystem.java
index d0210138a8..acbd0e5f9c 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/NevitSystem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/NevitSystem.java
@@ -190,8 +190,9 @@ public class NevitSystem implements IUniqueId
 		}
 	}
 	
-	public synchronized void startNevitEffect(int time)
+	public synchronized void startNevitEffect(int timeValue)
 	{
+		int time = timeValue;
 		if (getEffectTime() > 0)
 		{
 			stopNevitEffectTask(false);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index f8b097ced5..7ea09057e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -1837,9 +1837,9 @@ public abstract class AbstractScript extends ManagedScript
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -1850,16 +1850,18 @@ public abstract class AbstractScript extends ManagedScript
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId)
 	{
 		try
 		{
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.log(Level.SEVERE, "addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -1879,7 +1881,7 @@ public abstract class AbstractScript extends ManagedScript
 			final Spawn spawn = new Spawn(npcId);
 			spawn.setInstanceId(instanceId);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2212,11 +2214,11 @@ public abstract class AbstractScript extends ManagedScript
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2227,6 +2229,7 @@ public abstract class AbstractScript extends ManagedScript
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2468,29 +2471,29 @@ public abstract class AbstractScript extends ManagedScript
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index b8405587c5..18bf029f5d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index ab19914c62..fafc025e05 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -484,8 +484,9 @@ public class Instance
 		}
 	}
 	
-	private void parseInstance(Node n) throws Exception
+	private void parseInstance(Node node) throws Exception
 	{
+		Node n = node;
 		_templateId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		Node a = n.getAttributes().getNamedItem("ejectTime");
 		if (a != null)
@@ -758,11 +759,12 @@ public class Instance
 		}
 	}
 	
-	protected void doCheckTimeUp(int remaining)
+	protected void doCheckTimeUp(int value)
 	{
 		CreatureSay cs = null;
 		int timeLeft;
 		int interval;
+		int remaining = value;
 		if (_players.isEmpty() && (_emptyDestroyTime == 0))
 		{
 			remaining = 0;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
index 9b3ddd5672..324f5cbcbb 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java
@@ -76,13 +76,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -237,32 +238,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange(ItemInstance.ADDED);
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -320,13 +322,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -349,6 +351,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 47280fce18..865488ad2d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -446,24 +446,25 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		
-		if ((item != null) && (item.getId() == ADENA_ID) && !item.equals(_adena))
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			_adena = item;
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
+			{
+				_adena = addedItem;
+			}
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
+			{
+				_ancientAdena = addedItem;
+			}
+			
+			if (actor != null)
+			{
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor);
+			}
 		}
-		
-		if ((item != null) && (item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
-		{
-			_ancientAdena = item;
-		}
-		
-		if (item != null)
-		{
-			// Notify to scripts
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor);
-		}
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -571,7 +572,7 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
 		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
@@ -584,11 +585,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -634,7 +636,7 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
 		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
@@ -647,12 +649,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
 		
-		return item;
+		return droppedItem;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 23485ce609..ba5cfe3e61 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -177,15 +177,16 @@ public class QuestState
 	/**
 	 * Add parameter used in quests.
 	 * @param var String pointing out the name of the variable for quest
-	 * @param value String pointing out the value of the variable for quest
+	 * @param val String pointing out the value of the variable for quest
 	 */
-	public void setInternal(String var, String value)
+	public void setInternal(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
@@ -211,15 +212,16 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_vars == null)
 		{
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/BaseStat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
index 5bea0d551b..f484368bcf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/BaseStat.java
@@ -78,15 +78,16 @@ public enum BaseStat
 	
 	public static BaseStat valueOfXml(String name)
 	{
-		name = name.intern();
+		final String internName = name.intern();
 		for (BaseStat s : values())
 		{
-			if (s.getValue().equalsIgnoreCase(name))
+			if (s.getValue().equalsIgnoreCase(internName))
 			{
 				return s;
 			}
 		}
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 	
 	protected static final class STR implements IBaseStatFunction
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java
index 2d6ec47674..aec2839e45 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Formulas.java
@@ -1921,8 +1921,8 @@ public class Formulas
 	public static boolean calcCancelSuccess(BuffInfo info, int cancelMagicLvl, int rate, Skill skill)
 	{
 		// Lvl Bonus Modifier.
-		rate *= info.getSkill().getMagicLevel() > 0 ? 1 + ((cancelMagicLvl - info.getSkill().getMagicLevel()) / 100.) : 1;
-		return Rnd.get(100) < Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
+		final int chance = (int) (rate * (info.getSkill().getMagicLevel() > 0 ? 1 + ((cancelMagicLvl - info.getSkill().getMagicLevel()) / 100.) : 1));
+		return Rnd.get(100) < Util.constrain(chance, skill.getMinChance(), skill.getMaxChance());
 	}
 	
 	/**
@@ -1996,7 +1996,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (exp > 0) // Received exp
 		{
-			exp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(exp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(exp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Stat.java
index c2da337c21..9a696208e0 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -211,15 +211,15 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum BaseStats");
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 47957caa25..14e5c8f4a1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.network.serverpackets;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.l2jmobius.commons.network.PacketWriter;
@@ -40,13 +41,11 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_objectId = creature.getObjectId();
 		_skillId = skillId;
 		_skillLevel = skillLevel;
-		
-		//@formatter:off
 		if (targets == null)
 		{
-			targets = new WorldObject[] { creature };
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		//@formatter:on
 		_targets = Arrays.asList(targets);
 	}
 	
@@ -59,6 +58,7 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.MAGIC_SKILL_LAUNCHED.writeId(packet);
+		
 		packet.writeD(_objectId);
 		packet.writeD(_skillId);
 		packet.writeD(_skillLevel);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index d73018ea1f..6e8d0066fe 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -148,16 +148,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 71e509bf89..f3fc612b14 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index da641dde8d..12d1e6d81b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -73,10 +73,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -89,11 +90,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 226310ca0a..add0f1361e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
index 6dbb62c92e..390ab57d68 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -112,10 +112,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -145,8 +146,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 609edbec64..3a62403523 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -149,7 +149,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -158,9 +158,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
@@ -231,7 +231,7 @@ public class HtmlUtil
 		return createPage(Arrays.asList(elements), elements.length, page, elementsPerPage, pagerFunction, bodyFunction);
 	}
 	
-	public static <T> PageResult createPage(Iterable<T> elements, int size, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
+	public static <T> PageResult createPage(Iterable<T> elements, int size, int pageValue, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction)
 	{
 		int pages = size / elementsPerPage;
 		if ((elementsPerPage * pages) < size)
@@ -256,6 +256,7 @@ public class HtmlUtil
 			}
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
index 8ecd9bbd9d..d0b4c3d186 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Util.java
@@ -99,11 +99,7 @@ public class Util
 	
 	public static int convertDegreeToClientHeading(double degree)
 	{
-		if (degree < 0)
-		{
-			degree += 360;
-		}
-		return (int) (degree * 182.044444444);
+		return (int) ((degree < 0 ? degree + 360 : degree) * 182.044444444);
 	}
 	
 	public static int calculateHeadingFrom(ILocational from, ILocational to)
@@ -687,15 +683,17 @@ public class Util
 		{
 			return "now";
 		}
-		time = Math.abs(time);
+		
+		int remaining = Math.abs(time);
 		String ret = "";
-		final long numDays = time / 86400;
-		time -= numDays * 86400;
-		final long numHours = time / 3600;
-		time -= numHours * 3600;
-		final long numMins = time / 60;
-		time -= numMins * 60;
-		final long numSeconds = time;
+		final long numDays = remaining / 86400;
+		remaining -= numDays * 86400;
+		final long numHours = remaining / 3600;
+		remaining -= numHours * 3600;
+		final long numMins = remaining / 60;
+		remaining -= numMins * 60;
+		final long numSeconds = remaining;
+		
 		if (numDays > 0)
 		{
 			ret += numDays + "d ";
@@ -712,6 +710,7 @@ public class Util
 		{
 			ret += numSeconds + "s";
 		}
+		
 		return ret.trim();
 	}
 	
@@ -862,8 +861,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -877,8 +875,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -892,8 +889,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 9f8e32cb26..333643b0b7 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -187,12 +187,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index b6fb30b20e..9ee155e0e3 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -321,7 +321,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getLocalizedMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getLocalizedMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_2.0_Saviors/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 47a903a079..833cfdd30b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 cbad6875ce..0b606ad5c9 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index ec73c840f8..16aa0fa807 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -107,7 +107,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java
index a28fb418fc..42c4c0903a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java
@@ -494,9 +494,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index a2d0913b21..8b49ce210c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ad1c29f15c..1676afdd9f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -177,6 +177,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -689,7 +690,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -727,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -837,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1201,7 +1210,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1246,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3151,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3204,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3218,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3995,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4353,7 +4369,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4371,6 +4387,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4479,20 +4496,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4501,14 +4520,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4516,36 +4535,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5049,8 +5068,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5059,8 +5079,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 7349ad377e..fe41eb2dd7 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1982,13 +1982,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2670,12 +2672,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2722,12 +2719,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3399,8 +3391,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3413,7 +3405,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3427,14 +3419,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3685,8 +3677,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3695,33 +3687,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3733,7 +3725,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4599,11 +4591,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8222,38 +8215,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8267,7 +8262,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8280,32 +8275,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8313,7 +8308,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8329,20 +8324,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8356,9 +8351,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8372,27 +8367,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8402,7 +8397,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8414,7 +8409,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 75096a8021..32d22c6b1f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -485,9 +489,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -528,13 +532,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 868c8125fd..fad603da78 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -942,13 +942,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
index dd716f2b8b..8b4978552d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 d4380e6103..c533cfb56d 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
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 93c8ed9580..3a6c0baa28 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -323,16 +323,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_2.1_Zaken/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 47a903a079..833cfdd30b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 cbad6875ce..0b606ad5c9 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index ec73c840f8..16aa0fa807 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -107,7 +107,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java
index a28fb418fc..42c4c0903a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java
@@ -494,9 +494,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index a2d0913b21..8b49ce210c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ad1c29f15c..1676afdd9f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -177,6 +177,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -689,7 +690,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -727,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -837,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1201,7 +1210,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1246,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3151,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3204,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3218,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3995,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4353,7 +4369,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4371,6 +4387,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4479,20 +4496,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4501,14 +4520,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4516,36 +4535,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5049,8 +5068,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5059,8 +5079,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index e5e410d0ea..347e248bac 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1982,13 +1982,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2670,12 +2672,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2722,12 +2719,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3399,8 +3391,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3413,7 +3405,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3427,14 +3419,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3685,8 +3677,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3695,33 +3687,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3733,7 +3725,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4599,11 +4591,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8222,38 +8215,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8267,7 +8262,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8280,32 +8275,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8313,7 +8308,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8329,20 +8324,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8356,9 +8351,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8372,27 +8367,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8402,7 +8397,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8414,7 +8409,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 643dc067fd..688922f124 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -485,9 +489,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -528,13 +532,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 868c8125fd..fad603da78 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -942,13 +942,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
index dd716f2b8b..8b4978552d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 d4380e6103..c533cfb56d 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
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 93c8ed9580..3a6c0baa28 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -323,16 +323,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_2.2_Antharas/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 47a903a079..833cfdd30b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 8cbb286bc9..896d9f232b 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index ec73c840f8..16aa0fa807 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -107,7 +107,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java
index a28fb418fc..42c4c0903a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java
@@ -494,9 +494,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index a2d0913b21..8b49ce210c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 3d62491b61..ba5a86bd9b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -177,6 +177,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -689,7 +690,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -727,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -837,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1201,7 +1210,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1246,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3151,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3204,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3218,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3995,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4353,7 +4369,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4371,6 +4387,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4479,20 +4496,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4501,14 +4520,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4516,45 +4535,45 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5058,8 +5077,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5068,8 +5088,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 2cefe3b173..7d04933958 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1980,13 +1980,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2668,12 +2670,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2720,12 +2717,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3397,8 +3389,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3411,7 +3403,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3425,14 +3417,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3669,8 +3661,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3679,33 +3671,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3717,7 +3709,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4584,11 +4576,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8208,38 +8201,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8253,7 +8248,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8266,32 +8261,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8299,7 +8294,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8315,20 +8310,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8342,9 +8337,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8358,27 +8353,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8388,7 +8383,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8400,7 +8395,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 41c444c663..c5d11f6de1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -485,9 +489,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -528,13 +532,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 868c8125fd..fad603da78 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -942,13 +942,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 78fc3cf2c1..35e5fdda3a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 d4380e6103..c533cfb56d 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
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
index ab1bb20905..8a9c423a09 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -328,16 +328,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 1fc8a3d909..7d23c341e6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 8cbb286bc9..896d9f232b 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index f261910794..2f8c7f2f9c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -108,7 +108,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
index eba3e64288..29a88cf20c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -356,46 +356,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java
index 0e254b428c..4e6b7662bb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java
@@ -496,9 +496,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3f8e1a88c1..0d7e0d85da 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -697,12 +697,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -729,6 +730,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -776,8 +778,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 5d8a1dcf92..506048f5be 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -178,6 +178,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -690,7 +691,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -728,14 +729,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +845,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1202,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1247,11 +1256,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3164,9 +3174,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3217,12 +3227,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3231,6 +3241,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -4008,13 +4023,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4366,7 +4382,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4384,6 +4400,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4492,20 +4509,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4514,7 +4533,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
@@ -4525,57 +4544,57 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
 			if (!reflect)
 			{
-				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
-				value += elementalDamage;
+				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, amount);
+				amount += elementalDamage;
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, elementalDamage, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, elementalDamage, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5080,8 +5099,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5090,8 +5110,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 08d65acb62..98b145a2c7 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1990,13 +1990,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2679,12 +2681,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2731,12 +2728,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3408,8 +3400,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3422,7 +3414,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3436,14 +3428,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3680,8 +3672,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3690,33 +3682,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3728,7 +3720,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4595,11 +4587,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8235,38 +8228,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8280,7 +8275,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8293,32 +8288,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8326,7 +8321,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8342,20 +8337,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8369,9 +8364,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8385,27 +8380,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8415,7 +8410,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8427,7 +8422,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d9a32ef9ea..c4ba6ed23b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -98,7 +98,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -108,6 +108,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -408,18 +411,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -486,9 +490,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -529,13 +533,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 5d812860d1..bb8bda51e9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -974,13 +974,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 78fc3cf2c1..35e5fdda3a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index e368c9ec27..086246cddf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 4e8b960f1f..84324f0bee 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
@@ -205,14 +205,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1239,7 +1241,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 0190ec56cd..d982929f07 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -344,16 +344,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 1fc8a3d909..7d23c341e6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index cb0a635058..22fb62c40a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 8cbb286bc9..896d9f232b 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index f261910794..2f8c7f2f9c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -108,7 +108,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
index eba3e64288..29a88cf20c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -356,46 +356,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
index 3f3ba440c2..174b2b110d 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java
@@ -498,9 +498,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3f8e1a88c1..0d7e0d85da 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -697,12 +697,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -729,6 +730,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -776,8 +778,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 5d8a1dcf92..506048f5be 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -178,6 +178,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -690,7 +691,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -728,14 +729,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +845,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1202,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1247,11 +1256,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3164,9 +3174,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3217,12 +3227,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3231,6 +3241,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -4008,13 +4023,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4366,7 +4382,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4384,6 +4400,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4492,20 +4509,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4514,7 +4533,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
@@ -4525,57 +4544,57 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
 			if (!reflect)
 			{
-				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
-				value += elementalDamage;
+				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, amount);
+				amount += elementalDamage;
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, elementalDamage, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, elementalDamage, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5080,8 +5099,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5090,8 +5110,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 0f1b889eb5..71d2bbd0b1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1990,13 +1990,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2679,12 +2681,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2731,12 +2728,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3408,8 +3400,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3422,7 +3414,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3436,14 +3428,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3680,8 +3672,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3690,33 +3682,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3728,7 +3720,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4595,11 +4587,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8235,38 +8228,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8280,7 +8275,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8293,32 +8288,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8326,7 +8321,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8342,20 +8337,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8369,9 +8364,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8385,27 +8380,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8415,7 +8410,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8427,7 +8422,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index d9a32ef9ea..c4ba6ed23b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -98,7 +98,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -108,6 +108,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -408,18 +411,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -486,9 +490,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -529,13 +533,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 5d812860d1..bb8bda51e9 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -974,13 +974,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 78fc3cf2c1..35e5fdda3a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index e368c9ec27..086246cddf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 4e8b960f1f..84324f0bee 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
@@ -205,14 +205,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1239,7 +1241,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
index 0190ec56cd..d982929f07 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -344,16 +344,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_3.0_TheKamael/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 1fc8a3d909..7d23c341e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index ef86c482f9..442cebf1a1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -233,7 +233,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -241,6 +241,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index cb0a635058..22fb62c40a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 f1ad16aaa4..590c10c187 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
@@ -1065,8 +1065,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1167,7 +1168,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1180,6 +1181,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index f261910794..2f8c7f2f9c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -108,7 +108,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
index eba3e64288..29a88cf20c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -356,46 +356,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java
index 94f5fdbac0..1f8d9bb63d 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/GameServer.java
@@ -502,9 +502,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index a7e0b7c617..7c2adaeab2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index e92f55db0d..36b6f6451f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -224,10 +224,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -250,9 +250,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -262,6 +261,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 50d2b66c7e..6188ff4995 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -443,10 +443,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index 9305ea230d..003d4fbfc2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -193,14 +193,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -274,8 +275,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -323,12 +325,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -343,9 +347,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -360,8 +365,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 3f8e1a88c1..0d7e0d85da 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -697,12 +697,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -729,6 +730,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -776,8 +778,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index fb6f0cedee..dc2a2afb37 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -178,6 +178,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -690,7 +691,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -728,14 +729,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -838,8 +845,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1202,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1247,11 +1256,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3163,9 +3173,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3216,12 +3226,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3230,6 +3240,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -4007,13 +4022,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4365,7 +4381,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4383,6 +4399,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4491,20 +4508,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4513,7 +4532,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
@@ -4524,57 +4543,57 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 			
 			if (attacker.isRaid() || attacker.isRaidMinion())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_RAID), -80)) / 100;
 			}
 			else if (attacker.isMonster())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
 			if (!reflect)
 			{
-				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
-				value += elementalDamage;
+				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, amount);
+				amount += elementalDamage;
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, elementalDamage, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, elementalDamage, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5079,8 +5098,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5089,8 +5109,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e399a38dad..c1c30b430b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -802,9 +802,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 059a7cb917..1ba5ff9f95 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -2004,13 +2004,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2599,12 +2601,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2651,12 +2648,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3328,8 +3320,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3342,7 +3334,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3356,14 +3348,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3600,8 +3592,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3610,33 +3602,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3648,7 +3640,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4515,11 +4507,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8152,38 +8145,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8197,7 +8192,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8210,32 +8205,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8243,7 +8238,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8259,20 +8254,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8286,9 +8281,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8302,27 +8297,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target, true))
+		if (!usedSkill.checkCondition(this, target, true))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8332,7 +8327,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8344,7 +8339,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 3ceaaf6435..ba1e85603a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -98,7 +98,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -108,6 +108,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -406,18 +409,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -484,9 +488,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -527,13 +531,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 5d812860d1..bb8bda51e9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -974,13 +974,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
index 78fc3cf2c1..35e5fdda3a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java
index fcfdedd4f0..13995b8e2e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -190,10 +190,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index e368c9ec27..086246cddf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 0de128868b..b6bd8507f2 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList();
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 12358cbb83..3bc7a88bdc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 4e8b960f1f..84324f0bee 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
@@ -205,14 +205,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1239,7 +1241,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
index f2dd7a8437..b39e3c6bee 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -346,16 +346,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs b/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs
index b9a539e668..892cd431b7 100644
--- a/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_Mobius_Classic_Interlude/.settings/org.eclipse.jdt.core.prefs
@@ -12,8 +12,11 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
 org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
@@ -24,6 +27,8 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -75,12 +80,14 @@ org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
@@ -96,17 +103,23 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
 org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
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 507a6c8e39..6e9f4d3720 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
@@ -158,14 +158,13 @@ public class DrChaos extends AbstractNpcAI
 			GrandBossManager.getInstance().addBoss(golem);
 			
 			// The "npc" variable attribution is now for the golem.
-			npc = golem;
-			npc.broadcastPacket(new SpecialCamera(npc, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
-			npc.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
-			npc.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
+			golem.broadcastPacket(new SpecialCamera(golem, 30, 200, 20, 6000, 700, 8000, 0, 0, 0, 0, 0));
+			golem.broadcastPacket(new SocialAction(golem.getObjectId(), 1));
+			golem.broadcastPacket(new PlaySound(1, "Rm03_A", 0, 0, 0, 0, 0));
 			
 			// start monitoring Dr. Chaos's inactivity
 			_lastAttackVsGolem = System.currentTimeMillis();
-			startQuestTimer("golem_despawn", 60000, npc, null, true);
+			startQuestTimer("golem_despawn", 60000, golem, null, true);
 		}
 		// Check every sec if someone is in range, if found, launch one task to decrease the timer.
 		else if (event.equalsIgnoreCase("paranoia_activity"))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
index 1fc8a3d909..7d23c341e6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java
@@ -462,8 +462,9 @@ public class ClanHallManager extends AbstractNpcAI
 		World.getInstance().forEachVisibleObject(npc, PlayerInstance.class, player -> player.sendPacket(new AgitDecoInfo(clanHall)));
 	}
 	
-	private String getFunctionInfo(ResidenceFunction func, String htmltext, String name)
+	private String getFunctionInfo(ResidenceFunction func, String htmltextValue, String name)
 	{
+		String htmltext = htmltextValue;
 		if (func != null)
 		{
 			htmltext = htmltext.replaceAll("%" + name + "recovery%", String.valueOf((int) func.getTemplate().getValue()) + "%");
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
index 66e7e5219d..165a4c6638 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java
@@ -235,7 +235,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 	}
 	
 	@Override
-	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+	public String onAdvEvent(String eventValue, Npc npc, PlayerInstance player)
 	{
 		if (!_isEnabled)
 		{
@@ -243,6 +243,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
 		}
 		
 		String htmltext = null;
+		String event = eventValue;
 		final StringTokenizer st = new StringTokenizer(event);
 		event = st.nextToken();
 		switch (event)
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index dd3d919ac9..1522a36157 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -61,8 +61,9 @@ public class AdminBuffs implements IAdminCommandHandler
 	private static final String FONT_RED2 = "</font>";
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.startsWith("admin_buff"))
 		{
 			if ((activeChar.getTarget() == null) || !activeChar.getTarget().isCreature())
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 cbad6875ce..0b606ad5c9 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
@@ -1075,8 +1075,9 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance player)
+	private void showCharacterInfo(PlayerInstance activeChar, PlayerInstance targetPlayer)
 	{
+		PlayerInstance player = targetPlayer;
 		if (player == null)
 		{
 			final WorldObject target = activeChar.getTarget();
@@ -1177,7 +1178,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private void setTargetReputation(PlayerInstance activeChar, int newReputation)
+	private void setTargetReputation(PlayerInstance activeChar, int value)
 	{
 		final WorldObject target = activeChar.getTarget();
 		PlayerInstance player = null;
@@ -1190,6 +1191,7 @@ public class AdminEditChar implements IAdminCommandHandler
 			return;
 		}
 		
+		int newReputation = value;
 		if (newReputation > Config.MAX_REPUTATION)
 		{
 			newReputation = Config.MAX_REPUTATION;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
index 53229e0b8c..e63772ef1f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java
@@ -109,8 +109,9 @@ public class AdminEffects implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command);
 		st.nextToken();
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
index 91259505bf..b9d446d586 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -160,10 +160,10 @@ public class AdminFightCalculator implements IAdminCommandHandler
 	
 	private void handleShow(String params, PlayerInstance activeChar)
 	{
-		params = params.trim();
+		String trimmedParams = params.trim();
 		Creature npc1 = null;
 		Creature npc2 = null;
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			npc1 = activeChar;
 			npc2 = (Creature) activeChar.getTarget();
@@ -177,7 +177,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		{
 			int mid1 = 0;
 			int mid2 = 0;
-			final StringTokenizer st = new StringTokenizer(params);
+			final StringTokenizer st = new StringTokenizer(trimmedParams);
 			mid1 = Integer.parseInt(st.nextToken());
 			mid2 = Integer.parseInt(st.nextToken());
 			npc1 = new MonsterInstance(NpcData.getInstance().getTemplate(mid1));
@@ -291,7 +291,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
 		final StringBuilder replyMSG = new StringBuilder(1000);
 		replyMSG.append("<html><title>Selected mobs to fight</title><body><table>");
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<tr><td width=140>Parameter</td><td width=70>me</td><td width=70>target</td></tr>");
 		}
@@ -321,7 +321,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		
 		replyMSG.append("</tr></table><center><br>");
 		
-		if (params.isEmpty())
+		if (trimmedParams.isEmpty())
 		{
 			replyMSG.append("<button value=\"Retry\" action=\"bypass -h admin_fight_calculator_show\"  width=100 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
 		}
@@ -334,7 +334,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
 		adminReply.setHtml(replyMSG.toString());
 		activeChar.sendPacket(adminReply);
 		
-		if (params.length() != 0)
+		if (trimmedParams.length() != 0)
 		{
 			npc1.deleteMe();
 			npc2.deleteMe();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
index a163a9699a..77ae194287 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java
@@ -49,8 +49,9 @@ public class AdminFortSiege implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		final StringTokenizer st = new StringTokenizer(command, " ");
 		command = st.nextToken(); // Get actual command
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
index 72117290b3..e2c17e3d50 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -37,9 +37,10 @@ public class AdminInstanceZone implements IAdminCommandHandler
 	};
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
 		final String target = (activeChar.getTarget() != null) ? activeChar.getTarget().getName() : "no-target";
+		String command = commandValue;
 		GMAudit.auditGMAction(activeChar.getName(), command, target, "");
 		if (command.startsWith("admin_instancezone_clear"))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
index 848b7c420f..2c4b4f1af4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java
@@ -86,8 +86,9 @@ public class AdminSkill implements IAdminCommandHandler
 	private static Skill[] adminSkills;
 	
 	@Override
-	public boolean useAdminCommand(String command, PlayerInstance activeChar)
+	public boolean useAdminCommand(String commandValue, PlayerInstance activeChar)
 	{
+		String command = commandValue;
 		if (command.equals("admin_show_skills"))
 		{
 			showMainPage(activeChar);
@@ -343,9 +344,9 @@ public class AdminSkill implements IAdminCommandHandler
 	/**
 	 * TODO: Externalize HTML
 	 * @param activeChar the active Game Master.
-	 * @param page
+	 * @param pageValue
 	 */
-	private void removeSkillsPage(PlayerInstance activeChar, int page)
+	private void removeSkillsPage(PlayerInstance activeChar, int pageValue)
 	{
 		final WorldObject target = activeChar.getTarget();
 		if ((target == null) || !target.isPlayer())
@@ -363,6 +364,7 @@ public class AdminSkill implements IAdminCommandHandler
 			maxPages++;
 		}
 		
+		int page = pageValue;
 		if (page > maxPages)
 		{
 			page = maxPages;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
index cc57ce4ce0..c3c5063e0a 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java
@@ -501,7 +501,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 	}
 	
-	private void spawnMonster(PlayerInstance activeChar, String monsterId, int respawnTime, int mobCount, boolean permanent)
+	private void spawnMonster(PlayerInstance activeChar, String monsterIdValue, int respawnTime, int mobCount, boolean permanentValue)
 	{
 		WorldObject target = activeChar.getTarget();
 		if (target == null)
@@ -510,6 +510,7 @@ public class AdminSpawn implements IAdminCommandHandler
 		}
 		
 		final NpcTemplate template1;
+		String monsterId = monsterIdValue;
 		if (monsterId.matches("[0-9]*"))
 		{
 			// First parameter was an ID number
@@ -536,6 +537,8 @@ public class AdminSpawn implements IAdminCommandHandler
 			spawn.setAmount(mobCount);
 			spawn.setHeading(activeChar.getHeading());
 			spawn.setRespawnDelay(respawnTime);
+			
+			boolean permanent = permanentValue;
 			if (activeChar.isInInstance())
 			{
 				spawn.setInstanceId(activeChar.getInstanceId());
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
index 122126fb91..99a8f24f2e 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
@@ -343,7 +343,7 @@ public class NpcViewMod implements IBypassHandler
 		return sb.toString();
 	}
 	
-	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
+	private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int pageValue)
 	{
 		final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
 		if (dropList == null)
@@ -368,6 +368,7 @@ public class NpcViewMod implements IBypassHandler
 			pagesSb.append("</tr></table>");
 		}
 		
+		int page = pageValue;
 		if (page >= pages)
 		{
 			page = pages - 1;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
index 9be9eb040d..f14451a3d4 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
@@ -101,17 +101,18 @@ public class QuestLink implements IBypassHandler
 			.collect(Collectors.toSet());
 		//@formatter:on
 		
+		Collection<Quest> questList = quests;
 		if (Config.ORDER_QUEST_LIST_BY_QUESTID)
 		{
 			final Map<Integer, Quest> orderedQuests = new TreeMap<>(); // Use TreeMap to order quests
-			for (Quest q : quests)
+			for (Quest q : questList)
 			{
 				orderedQuests.put(q.getId(), q);
 			}
-			quests = orderedQuests.values();
+			questList = orderedQuests.values();
 		}
 		
-		for (Quest quest : quests)
+		for (Quest quest : questList)
 		{
 			final QuestState qs = player.getQuestState(quest.getScriptName());
 			if ((qs == null) || qs.isCreated() || (qs.isCompleted() && qs.isNowAvailable()))
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
index 37d1a6eec6..b712263a31 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java
@@ -43,7 +43,7 @@ public class ChatGeneral implements IChatHandler
 	};
 	
 	@Override
-	public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text)
+	public void handleChat(ChatType type, PlayerInstance activeChar, String paramsValue, String text)
 	{
 		boolean vcdUsed = false;
 		if (text.startsWith("."))
@@ -51,6 +51,7 @@ public class ChatGeneral implements IChatHandler
 			final StringTokenizer st = new StringTokenizer(text);
 			final IVoicedCommandHandler vch;
 			String command = "";
+			String params = paramsValue;
 			if (st.countTokens() > 1)
 			{
 				command = st.nextToken().substring(1);
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
index 54887c47c9..bd4f20daa3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/communityboard/ClanBoard.java
@@ -176,8 +176,9 @@ public class ClanBoard implements IWriteBoardHandler
 		}
 	}
 	
-	private void clanList(PlayerInstance player, int index)
+	private void clanList(PlayerInstance player, int indexValue)
 	{
+		int index = indexValue;
 		if (index < 1)
 		{
 			index = 1;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
index 3661d2c625..f3b4345079 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddHate.java
@@ -45,8 +45,9 @@ public class AddHate extends AbstractEffect
 	}
 	
 	@Override
-	public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
+	public void instant(Creature creature, Creature effected, Skill skill, ItemInstance item)
 	{
+		Creature effector = creature;
 		if (_affectSummoner && (effector.getSummoner() != null))
 		{
 			effector = effector.getSummoner();
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index 300c734643..763515caba 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -198,45 +198,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "DO_One":
 			{
 				qs.set("DO", "1");
-				event = "32122-4d.html";
-				break;
+				return "32122-4d.html";
 			}
 			case "MI_One":
 			{
 				qs.set("MI", "1");
-				event = "32122-4f.html";
-				break;
+				return "32122-4f.html";
 			}
 			case "FA_One":
 			{
 				qs.set("FA", "1");
-				event = "32122-4h.html";
-				break;
+				return "32122-4h.html";
 			}
 			case "SOL_One":
 			{
 				qs.set("SOL", "1");
-				event = "32122-4j.html";
-				break;
+				return "32122-4j.html";
 			}
 			case "FA2_One":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(14) && (qs.getInt("DO") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-4n.html";
 					qs.setCond(15, true);
-				}
-				else
-				{
-					event = "32122-4m.html";
+					qs.unset("DO");
+					qs.unset("MI");
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("FA2");
+					return "32122-4n.html";
 				}
 				qs.unset("DO");
 				qs.unset("MI");
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("FA2");
-				break;
+				return "32122-4m.html";
 			}
 			case "32122-4m.html":
 			{
@@ -250,45 +247,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "FA_Two":
 			{
 				qs.set("FA", "1");
-				event = "32122-5a.html";
-				break;
+				return "32122-5a.html";
 			}
 			case "SOL_Two":
 			{
 				qs.set("SOL", "1");
-				event = "32122-5c.html";
-				break;
+				return "32122-5c.html";
 			}
 			case "TI_Two":
 			{
 				qs.set("TI", "1");
-				event = "32122-5e.html";
-				break;
+				return "32122-5e.html";
 			}
 			case "SOL2_Two":
 			{
 				qs.set("SOL2", "1");
-				event = "32122-5g.html";
-				break;
+				return "32122-5g.html";
 			}
 			case "FA2_Two":
 			{
 				qs.set("FA2", "1");
 				if (qs.isCond(15) && (qs.getInt("FA") > 0) && (qs.getInt("SOL") > 0) && (qs.getInt("TI") > 0) && (qs.getInt("SOL2") > 0) && (qs.getInt("FA2") > 0))
 				{
-					event = "32122-5j.html";
 					qs.setCond(16, true);
-				}
-				else
-				{
-					event = "32122-5i.html";
+					qs.unset("FA");
+					qs.unset("SOL");
+					qs.unset("TI");
+					qs.unset("SOL2");
+					qs.unset("FA2");
+					return "32122-5j.html";
 				}
 				qs.unset("FA");
 				qs.unset("SOL");
 				qs.unset("TI");
 				qs.unset("SOL2");
 				qs.unset("FA2");
-				break;
+				return "32122-5i.html";
 			}
 			case "32122-5i.html":
 			{
@@ -302,45 +296,42 @@ public class Q00126_TheNameOfEvil2 extends Quest
 			case "SOL_Three":
 			{
 				qs.set("SOL", "1");
-				event = "32122-6a.html";
-				break;
+				return "32122-6a.html";
 			}
 			case "FA_Three":
 			{
 				qs.set("FA", "1");
-				event = "32122-6c.html";
-				break;
+				return "32122-6c.html";
 			}
 			case "MI_Three":
 			{
 				qs.set("MI", "1");
-				event = "32122-6e.html";
-				break;
+				return "32122-6e.html";
 			}
 			case "FA2_Three":
 			{
 				qs.set("FA2", "1");
-				event = "32122-6g.html";
-				break;
+				return "32122-6g.html";
 			}
 			case "MI2_Three":
 			{
 				qs.set("MI2", "1");
 				if (qs.isCond(16) && (qs.getInt("SOL") > 0) && (qs.getInt("FA") > 0) && (qs.getInt("MI") > 0) && (qs.getInt("FA2") > 0) && (qs.getInt("MI2") > 0))
 				{
-					event = "32122-6j.html";
 					qs.setCond(17, true);
-				}
-				else
-				{
-					event = "32122-6i.html";
+					qs.unset("SOL");
+					qs.unset("FA");
+					qs.unset("MI");
+					qs.unset("FA2");
+					qs.unset("MI2");
+					return "32122-6j.html";
 				}
 				qs.unset("SOL");
 				qs.unset("FA");
 				qs.unset("MI");
 				qs.unset("FA2");
 				qs.unset("MI2");
-				break;
+				return "32122-6i.html";
 			}
 			case "32122-6i.html":
 			{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
index 02ad6796a2..8bacb67066 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java
@@ -101,7 +101,7 @@ public class Q00500_BrothersBoundInChains extends Quest
 				}
 				else
 				{
-					event = "30981-05.html";
+					return "30981-05.html";
 				}
 				break;
 			}
@@ -124,13 +124,13 @@ public class Q00500_BrothersBoundInChains extends Quest
 				{
 					// If player delete QuestItems: Need check how it work on retail.
 					qs.setCond(1);
-					event = "30981-07.html";
+					return "30981-07.html";
 				}
 				break;
 			}
 			default:
 			{
-				event = getNoQuestMsg(player);
+				return getNoQuestMsg(player);
 			}
 		}
 		
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
index d0d50b9049..a066f7bdd0 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange1/DarkElfChange1.java
@@ -92,7 +92,7 @@ public class DarkElfChange1 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = npc.getId() + "-" + suffix + ".html";
+				return npc.getId() + "-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
index 90339f6c85..e142c280fb 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/village_master/DarkElfChange2/DarkElfChange2.java
@@ -112,7 +112,7 @@ public class DarkElfChange2 extends AbstractNpcAI
 						player.broadcastUserInfo();
 					}
 				}
-				event = "30474-" + suffix + ".html";
+				return "30474-" + suffix + ".html";
 			}
 		}
 		return event;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
index ba698981cc..14ae3a4560 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/CommonUtil.java
@@ -350,46 +350,46 @@ public class CommonUtil
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
+	public static int map(int inputValue, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final int input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
+	public static long map(long inputValue, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final long input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
 	 * Re-Maps a value from one range to another.
-	 * @param input
+	 * @param inputValue
 	 * @param inputMin
 	 * @param inputMax
 	 * @param outputMin
 	 * @param outputMax
 	 * @return The mapped value
 	 */
-	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
+	public static double map(double inputValue, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
+		final double input = constrain(inputValue, inputMin, inputMax);
 		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/HexUtils.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/HexUtils.java
index 14b3c1c8ff..4567492fe7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/HexUtils.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/HexUtils.java
@@ -59,12 +59,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of a byte
 	 * @param data byte to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] b2HexChars(byte data, char[] dstHexChars, int dstOffset)
+	public static char[] b2HexChars(byte data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[2];
@@ -92,12 +94,14 @@ public class HexUtils
 	/**
 	 * Method to generate the hexadecimal character presentation of an integer
 	 * @param data integer to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with 8 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] int2HexChars(int data, char[] dstHexChars, int dstOffset)
+	public static char[] int2HexChars(int data, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[8];
@@ -108,6 +112,7 @@ public class HexUtils
 		b2HexChars((byte) ((data & 0x00FF0000) >> 16), dstHexChars, dstOffset + 2);
 		b2HexChars((byte) ((data & 0x0000FF00) >> 8), dstHexChars, dstOffset + 4);
 		b2HexChars((byte) (data & 0x000000FF), dstHexChars, dstOffset + 6);
+		
 		return dstHexChars;
 	}
 	
@@ -129,12 +134,14 @@ public class HexUtils
 	 * @param data byte array to generate the hexadecimal character presentation from
 	 * @param offset offset where to start in data array
 	 * @param len number of bytes to generate the hexadecimal character presentation from
-	 * @param dstHexChars the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
-	 * @param dstOffset offset at which the hexadecimal character presentation is copied to dstHexChars
+	 * @param dstHexCharsValue the char array the hexadecimal character presentation should be copied to, if this is null, dstOffset is ignored and a new char array with len*2 elements is created
+	 * @param dstOffsetValue offset at which the hexadecimal character presentation is copied to dstHexChars
 	 * @return the char array the hexadecimal character presentation was copied to
 	 */
-	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexChars, int dstOffset)
+	public static char[] bArr2HexChars(byte[] data, int offset, int len, char[] dstHexCharsValue, int dstOffsetValue)
 	{
+		char[] dstHexChars = dstHexCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstHexChars == null)
 		{
 			dstHexChars = new char[len * 2];
@@ -157,8 +164,10 @@ public class HexUtils
 		return bArr2AsciiChars(data, offset, len, new char[len], 0);
 	}
 	
-	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiChars, int dstOffset)
+	public static char[] bArr2AsciiChars(byte[] data, int offset, int len, char[] dstAsciiCharsValue, int dstOffsetValue)
 	{
+		char[] dstAsciiChars = dstAsciiCharsValue;
+		int dstOffset = dstOffsetValue;
 		if (dstAsciiChars == null)
 		{
 			dstAsciiChars = new char[len];
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
index aa8ac8f064..9304a3acb9 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java
@@ -1130,6 +1130,7 @@ public class BlowfishEngine
 	 * @param xr
 	 * @param table
 	 */
+	@SuppressWarnings("all")
 	private void processTable(int xl, int xr, int[] table)
 	{
 		final int size = table.length;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java
index b2bb4c5014..e2206a9d43 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/GameServer.java
@@ -496,9 +496,9 @@ public class GameServer
 		INSTANCE = new GameServer();
 	}
 	
-	private void printSection(String s)
+	private void printSection(String section)
 	{
-		s = "=[ " + s + " ]";
+		String s = "=[ " + section + " ]";
 		while (s.length() < 61)
 		{
 			s = "-" + s;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
index e07ac52791..96a1863160 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/Shutdown.java
@@ -100,11 +100,7 @@ public class Shutdown extends Thread
 	 */
 	public Shutdown(int seconds, boolean restart)
 	{
-		if (seconds < 0)
-		{
-			seconds = 0;
-		}
-		_secondsShut = seconds;
+		_secondsShut = Math.max(0, seconds);
 		_shutdownMode = restart ? GM_RESTART : GM_SHUTDOWN;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
index 3620a8814e..1480e8207f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AbstractAI.java
@@ -423,13 +423,14 @@ public abstract class AbstractAI implements Ctrl
 	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <i>(broadcast)</i>.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: Low level function, used by AI subclasses</b></font>
 	 * @param pawn
-	 * @param offset
+	 * @param offsetValue
 	 */
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && !_actor.isAttackingNow() && !_actor.isCastingNow())
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
index 4104e382a0..1e9dc3709d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
@@ -199,12 +199,13 @@ public class AttackableAI extends CreatureAI
 	/**
 	 * Set the Intention of this CreatureAI and create an AI Task executed every 1s (call onEvtThink method) for this Attackable.<br>
 	 * <font color=#FF0000><b><u>Caution</u>: If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</b></font>
-	 * @param intention The new Intention to set to the AI
+	 * @param newIntention The new Intention to set to the AI
 	 * @param args The first parameter of the Intention
 	 */
 	@Override
-	synchronized void changeIntention(CtrlIntention intention, Object... args)
+	synchronized void changeIntention(CtrlIntention newIntention, Object... args)
 	{
+		CtrlIntention intention = newIntention;
 		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE))
 		{
 			// Check if actor is not dead
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
index 30cb3186ba..f09c406ddb 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
@@ -945,10 +945,10 @@ public class CreatureAI extends AbstractAI
 	 * <li>PLayerAI, SummonAI</li>
 	 * </ul>
 	 * @param target The targeted WorldObject
-	 * @param offset The Interact area radius
+	 * @param offsetValue The Interact area radius
 	 * @return True if a movement must be done
 	 */
-	protected boolean maybeMoveToPawn(WorldObject target, int offset)
+	protected boolean maybeMoveToPawn(WorldObject target, int offsetValue)
 	{
 		// Get the distance between the current position of the Creature and the target (x,y)
 		if (target == null)
@@ -956,12 +956,12 @@ public class CreatureAI extends AbstractAI
 			LOGGER.warning("maybeMoveToPawn: target == NULL!");
 			return false;
 		}
-		if (offset < 0)
+		if (offsetValue < 0)
 		{
 			return false; // skill radius -1
 		}
 		
-		int offsetWithCollision = offset + _actor.getTemplate().getCollisionRadius();
+		int offsetWithCollision = offsetValue + _actor.getTemplate().getCollisionRadius();
 		if (target.isCreature())
 		{
 			offsetWithCollision += ((Creature) target).getTemplate().getCollisionRadius();
@@ -1008,6 +1008,7 @@ public class CreatureAI extends AbstractAI
 			}
 			
 			stopFollow();
+			int offset = offsetValue;
 			if (target.isCreature() && !target.isDoor())
 			{
 				if (((Creature) target).isMoving())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
index 6cab2aa265..854b291511 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/DoppelgangerAI.java
@@ -203,11 +203,12 @@ public class DoppelgangerAI extends CreatureAI
 	}
 	
 	@Override
-	public void moveToPawn(WorldObject pawn, int offset)
+	public void moveToPawn(WorldObject pawn, int offsetValue)
 	{
 		// Check if actor can move
 		if (!_actor.isMovementDisabled() && (_actor.getMoveSpeed() > 0))
 		{
+			int offset = offsetValue;
 			if (offset < 10)
 			{
 				offset = 10;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
index 07c293a7d2..f0057eca29 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExperienceData.java
@@ -103,7 +103,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _expTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _expTable.get(level);
 	}
@@ -112,7 +112,7 @@ public class ExperienceData implements IXmlReader
 	{
 		if (level > Config.PLAYER_MAXIMUM_LEVEL)
 		{
-			level = Config.PLAYER_MAXIMUM_LEVEL;
+			return _traningRateTable.get((int) Config.PLAYER_MAXIMUM_LEVEL);
 		}
 		return _traningRateTable.get(level);
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
index aa8d422ca9..b86a1a6a39 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/ExtendDropData.java
@@ -109,14 +109,15 @@ public class ExtendDropData implements IXmlReader
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		Node n = node;
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = value;
@@ -130,7 +131,7 @@ public class ExtendDropData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						list.add(value);
@@ -139,7 +140,7 @@ public class ExtendDropData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node);
+					final Object value = parseValue(n);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -156,7 +157,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -171,7 +172,7 @@ public class ExtendDropData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
index 69f1152e85..2e0c4a2517 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/MultisellData.java
@@ -236,10 +236,10 @@ public class MultisellData implements IXmlReader
 	 * @param player
 	 * @param npc
 	 * @param inventoryOnly
-	 * @param ingredientMultiplier
-	 * @param productMultiplier
+	 * @param ingredientMultiplierValue
+	 * @param productMultiplierValue
 	 */
-	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplier, double productMultiplier)
+	public void separateAndSend(int listId, PlayerInstance player, Npc npc, boolean inventoryOnly, double ingredientMultiplierValue, double productMultiplierValue)
 	{
 		final MultisellListHolder template = _multisells.get(listId);
 		if (template == null)
@@ -262,9 +262,8 @@ public class MultisellData implements IXmlReader
 		}
 		
 		// Check if ingredient/product multipliers are set, if not, set them to the template value.
-		ingredientMultiplier = (Double.isNaN(ingredientMultiplier) ? template.getIngredientMultiplier() : ingredientMultiplier);
-		productMultiplier = (Double.isNaN(productMultiplier) ? template.getProductMultiplier() : productMultiplier);
-		
+		final double ingredientMultiplier = (Double.isNaN(ingredientMultiplierValue) ? template.getIngredientMultiplier() : ingredientMultiplierValue);
+		final double productMultiplier = (Double.isNaN(productMultiplierValue) ? template.getProductMultiplier() : productMultiplierValue);
 		final PreparedMultisellListHolder list = new PreparedMultisellListHolder(template, inventoryOnly, player.getInventory(), npc, ingredientMultiplier, productMultiplier);
 		int index = 0;
 		do
@@ -274,6 +273,7 @@ public class MultisellData implements IXmlReader
 			index += PAGE_SIZE;
 		}
 		while (index < list.getEntries().size());
+		
 		player.setMultiSell(list);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
index d6b28a5962..837ad02f69 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java
@@ -98,6 +98,7 @@ public class SendMessageLocalisationData implements IXmlReader
 				// Consider using proper SystemMessages where possible.
 				String[] searchMessage;
 				String[] replacementMessage;
+				String localisation = message;
 				boolean found;
 				for (Entry<String[], String[]> entry : localisations.entrySet())
 				{
@@ -107,7 +108,7 @@ public class SendMessageLocalisationData implements IXmlReader
 					// Exact match.
 					if (searchMessage.length == 1)
 					{
-						if (searchMessage[0].equals(message))
+						if (searchMessage[0].equals(localisation))
 						{
 							return replacementMessage[0];
 						}
@@ -117,7 +118,7 @@ public class SendMessageLocalisationData implements IXmlReader
 						found = true;
 						for (String part : searchMessage)
 						{
-							if (!message.contains(part))
+							if (!localisation.contains(part))
 							{
 								found = false;
 								break;
@@ -127,12 +128,13 @@ public class SendMessageLocalisationData implements IXmlReader
 						{
 							for (int i = 0; i < searchMessage.length; i++)
 							{
-								message = message.replace(searchMessage[i], replacementMessage[i]);
+								localisation = localisation.replace(searchMessage[i], replacementMessage[i]);
 							}
 							break;
 						}
 					}
 				}
+				return localisation;
 			}
 		}
 		return message;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
index a430d893f6..4b08765663 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillData.java
@@ -446,7 +446,8 @@ public class SkillData implements IXmlReader
 	
 	private NamedParamInfo parseNamedParamInfo(Node node, Map<String, Map<Integer, Map<Integer, Object>>> variableValues)
 	{
-		final NamedNodeMap attributes = node.getAttributes();
+		Node n = node;
+		final NamedNodeMap attributes = n.getAttributes();
 		final String name = parseString(attributes, "name");
 		final Integer level = parseInteger(attributes, "level");
 		final Integer fromLevel = parseInteger(attributes, "fromLevel", level);
@@ -455,11 +456,11 @@ public class SkillData implements IXmlReader
 		final Integer fromSubLevel = parseInteger(attributes, "fromSubLevel", subLevel);
 		final Integer toSubLevel = parseInteger(attributes, "toSubLevel", subLevel);
 		final Map<Integer, Map<Integer, StatSet>> info = new HashMap<>();
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			if (!node.getNodeName().equals("#text"))
+			if (!n.getNodeName().equals("#text"))
 			{
-				parseInfo(node, variableValues, info);
+				parseInfo(n, variableValues, info);
 			}
 		}
 		return new NamedParamInfo(name, fromLevel, toLevel, fromSubLevel, toSubLevel, info);
@@ -491,23 +492,24 @@ public class SkillData implements IXmlReader
 	
 	private Map<Integer, Map<Integer, Object>> parseValues(Node node)
 	{
+		Node n = node;
 		final Map<Integer, Map<Integer, Object>> values = new HashMap<>();
-		Object parsedValue = parseValue(node, true, false, Collections.emptyMap());
+		Object parsedValue = parseValue(n, true, false, Collections.emptyMap());
 		if (parsedValue != null)
 		{
 			values.computeIfAbsent(-1, k -> new HashMap<>()).put(-1, parsedValue);
 		}
 		else
 		{
-			for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
-				if (node.getNodeName().equalsIgnoreCase("value"))
+				if (n.getNodeName().equalsIgnoreCase("value"))
 				{
-					final NamedNodeMap attributes = node.getAttributes();
+					final NamedNodeMap attributes = n.getAttributes();
 					final Integer level = parseInteger(attributes, "level");
 					if (level != null)
 					{
-						parsedValue = parseValue(node, false, false, Collections.emptyMap());
+						parsedValue = parseValue(n, false, false, Collections.emptyMap());
 						if (parsedValue != null)
 						{
 							final Integer subLevel = parseInteger(attributes, "subLevel", -1);
@@ -533,7 +535,7 @@ public class SkillData implements IXmlReader
 								{
 									variables.put("base", Double.parseDouble(String.valueOf(base)));
 								}
-								parsedValue = parseValue(node, false, false, variables);
+								parsedValue = parseValue(n, false, false, variables);
 								if (parsedValue != null)
 								{
 									subValues.put(j, parsedValue);
@@ -549,22 +551,23 @@ public class SkillData implements IXmlReader
 	
 	Object parseValue(Node node, boolean blockValue, boolean parseAttributes, Map<String, Double> variables)
 	{
+		Node n = node;
 		StatSet statSet = null;
 		List<Object> list = null;
 		Object text = null;
-		if (parseAttributes && (!node.getNodeName().equals("value") || !blockValue) && (node.getAttributes().getLength() > 0))
+		if (parseAttributes && (!n.getNodeName().equals("value") || !blockValue) && (n.getAttributes().getLength() > 0))
 		{
 			statSet = new StatSet();
-			parseAttributes(node.getAttributes(), "", statSet, variables);
+			parseAttributes(n.getAttributes(), "", statSet, variables);
 		}
-		for (node = node.getFirstChild(); node != null; node = node.getNextSibling())
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
-			final String nodeName = node.getNodeName();
-			switch (node.getNodeName())
+			final String nodeName = n.getNodeName();
+			switch (n.getNodeName())
 			{
 				case "#text":
 				{
-					final String value = node.getNodeValue().trim();
+					final String value = n.getNodeValue().trim();
 					if (!value.isEmpty())
 					{
 						text = parseNodeValue(value, variables);
@@ -578,7 +581,7 @@ public class SkillData implements IXmlReader
 						list = new LinkedList<>();
 					}
 					
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						list.add(value);
@@ -595,7 +598,7 @@ public class SkillData implements IXmlReader
 				}
 				default:
 				{
-					final Object value = parseValue(node, false, true, variables);
+					final Object value = parseValue(n, false, true, variables);
 					if (value != null)
 					{
 						if (statSet == null)
@@ -612,7 +615,7 @@ public class SkillData implements IXmlReader
 		{
 			if (text != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
@@ -627,7 +630,7 @@ public class SkillData implements IXmlReader
 		{
 			if (list != null)
 			{
-				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + node + "]");
+				throw new IllegalArgumentException("Text and list in same node are not allowed. Node[" + n + "]");
 			}
 			if (statSet != null)
 			{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
index 0407de3b99..8b63a0c0b7 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SkillTreeData.java
@@ -444,10 +444,11 @@ public class SkillTreeData implements IXmlReader
 		final Map<Long, SkillLearn> skillTree = new HashMap<>();
 		// Add all skills that belong to all classes.
 		skillTree.putAll(_commonSkillTree);
-		while ((classId != null) && (_classSkillTrees.get(classId) != null))
+		ClassId currentClassId = classId;
+		while ((currentClassId != null) && (_classSkillTrees.get(currentClassId) != null))
 		{
-			skillTree.putAll(_classSkillTrees.get(classId));
-			classId = _parentClassMap.get(classId);
+			skillTree.putAll(_classSkillTrees.get(currentClassId));
+			currentClassId = _parentClassMap.get(currentClassId);
 		}
 		return skillTree;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
index d6e89ae52f..951145ebd8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
@@ -194,14 +194,15 @@ public abstract class DocumentBase
 		_tables.put(name, table);
 	}
 	
-	protected void parseTemplate(Node n, Object template)
+	protected void parseTemplate(Node node, Object template)
 	{
 		Condition condition = null;
-		n = n.getFirstChild();
+		Node n = node.getFirstChild();
 		if (n == null)
 		{
 			return;
 		}
+		
 		if ("cond".equalsIgnoreCase(n.getNodeName()))
 		{
 			condition = parseCondition(n.getFirstChild(), template);
@@ -275,8 +276,9 @@ public abstract class DocumentBase
 		}
 	}
 	
-	protected Condition parseCondition(Node n, Object template)
+	protected Condition parseCondition(Node node, Object template)
 	{
+		Node n = node;
 		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE))
 		{
 			n = n.getNextSibling();
@@ -324,12 +326,14 @@ public abstract class DocumentBase
 				}
 			}
 		}
+		
 		return condition;
 	}
 	
-	protected Condition parseLogicAnd(Node n, Object template)
+	protected Condition parseLogicAnd(Node node, Object template)
 	{
 		final ConditionLogicAnd cond = new ConditionLogicAnd();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -344,9 +348,10 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicOr(Node n, Object template)
+	protected Condition parseLogicOr(Node node, Object template)
 	{
 		final ConditionLogicOr cond = new ConditionLogicOr();
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
@@ -361,8 +366,9 @@ public abstract class DocumentBase
 		return cond;
 	}
 	
-	protected Condition parseLogicNot(Node n, Object template)
+	protected Condition parseLogicNot(Node node, Object template)
 	{
+		Node n = node;
 		for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 		{
 			if (n.getNodeType() == Node.ELEMENT_NODE)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
index def2bccfc3..b39f10a3e8 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/engines/items/DocumentItem.java
@@ -102,8 +102,9 @@ public class DocumentItem extends DocumentBase implements IXmlReader
 		}
 	}
 	
-	protected void parseItem(Node n) throws InvocationTargetException
+	protected void parseItem(Node node) throws InvocationTargetException
 	{
+		Node n = node;
 		final int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
 		final String className = n.getAttributes().getNamedItem("type").getNodeValue();
 		final String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
index fa90637813..2d7964f047 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
@@ -494,19 +494,26 @@ public class GeoEngine
 	
 	/**
 	 * Simple check for origin to target visibility.
-	 * @param gox : origin X geodata coordinate
-	 * @param goy : origin Y geodata coordinate
-	 * @param goz : origin Z geodata coordinate
+	 * @param goxValue : origin X geodata coordinate
+	 * @param goyValue : origin Y geodata coordinate
+	 * @param gozValue : origin Z geodata coordinate
 	 * @param oheight : origin height (if instance of {@link Character})
-	 * @param gtx : target X geodata coordinate
-	 * @param gty : target Y geodata coordinate
-	 * @param gtz : target Z geodata coordinate
+	 * @param gtxValue : target X geodata coordinate
+	 * @param gtyValue : target Y geodata coordinate
+	 * @param gtzValue : target Z geodata coordinate
 	 * @param theight : target height (if instance of {@link Character})
 	 * @param instance
 	 * @return {@code boolean} : True, when target can be seen.
 	 */
-	private final boolean checkSee(int gox, int goy, int goz, double oheight, int gtx, int gty, int gtz, double theight, Instance instance)
+	private final boolean checkSee(int goxValue, int goyValue, int gozValue, double oheight, int gtxValue, int gtyValue, int gtzValue, double theight, Instance instance)
 	{
+		int goz = gozValue;
+		int gtz = gtzValue;
+		int gox = goxValue;
+		int goy = goyValue;
+		int gtx = gtxValue;
+		int gty = gtyValue;
+		
 		// get line of sight Z coordinates
 		double losoz = goz + ((oheight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
 		double lostz = gtz + ((theight * Config.PART_OF_CHARACTER_HEIGHT) / 100);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
index bf85ab0ab0..9c7ab9a042 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
@@ -167,10 +167,10 @@ final class GeoEnginePathfinding extends GeoEngine
 	
 	/**
 	 * Create list of node locations as result of calculated buffer node tree.
-	 * @param target : the entry point
+	 * @param node : the entry point
 	 * @return List<NodeLoc> : list of node location
 	 */
-	private static List<Location> constructPath(Node target)
+	private static List<Location> constructPath(Node node)
 	{
 		// create empty list
 		final LinkedList<Location> list = new LinkedList<>();
@@ -180,6 +180,7 @@ final class GeoEnginePathfinding extends GeoEngine
 		int dy = 0;
 		
 		// get target parent
+		Node target = node;
 		Node parent = target.getParent();
 		
 		// while parent exists
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/BypassHandler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/BypassHandler.java
index 5466b713dc..195703268f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/BypassHandler.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/handler/BypassHandler.java
@@ -50,8 +50,9 @@ public class BypassHandler implements IHandler<IBypassHandler, String>
 	}
 	
 	@Override
-	public IBypassHandler getHandler(String command)
+	public IBypassHandler getHandler(String commandValue)
 	{
+		String command = commandValue;
 		if (command.contains(" "))
 		{
 			command = command.substring(0, command.indexOf(' '));
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
index 862e6edc98..6bc30f2206 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManager.java
@@ -62,12 +62,13 @@ public class CastleManager implements InstanceListManager
 		return findNearestCastle(obj, Long.MAX_VALUE);
 	}
 	
-	public Castle findNearestCastle(WorldObject obj, long maxDistance)
+	public Castle findNearestCastle(WorldObject obj, long maxDistanceValue)
 	{
 		Castle nearestCastle = getCastle(obj);
 		if (nearestCastle == null)
 		{
 			double distance;
+			long maxDistance = maxDistanceValue;
 			for (Castle castle : _castles.values())
 			{
 				distance = castle.getDistance(obj);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
index b3d18b8f35..e60ae29a2e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
@@ -330,9 +330,9 @@ public class ClanEntryManager
 		return false;
 	}
 	
-	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortBy, boolean descending)
+	public List<PledgeWaitingInfo> getSortedWaitingList(int levelMin, int levelMax, int role, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, PLAYER_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, PLAYER_COMPARATOR.size() - 1);
 		
 		// TODO: Handle Role
 		//@formatter:off
@@ -373,9 +373,10 @@ public class ClanEntryManager
 		return _clanList.values().stream().collect(Collectors.toList());
 	}
 	
-	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortBy, boolean descending)
+	public List<PledgeRecruitInfo> getSortedClanList(int clanLevel, int karma, int sortByValue, boolean descending)
 	{
-		sortBy = CommonUtil.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1);
+		final int sortBy = CommonUtil.constrain(sortByValue, 1, CLAN_COMPARATOR.size() - 1);
+		
 		//@formatter:off
 		return _clanList.values().stream()
 		      .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != (p.getClan() != null ? p.getClanLevel() : 0))) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != (p.getClan() != null ? p.getClanLevel() : 0)) || (karma != p.getKarma()))))))
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
index ee97714e8f..30b289b8b6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortManager.java
@@ -42,11 +42,12 @@ public class FortManager implements InstanceListManager
 		return findNearestFort(obj, Long.MAX_VALUE);
 	}
 	
-	public Fort findNearestFort(WorldObject obj, long maxDistance)
+	public Fort findNearestFort(WorldObject obj, long maxDistanceValue)
 	{
 		Fort nearestFort = getFort(obj);
 		if (nearestFort == null)
 		{
+			long maxDistance = maxDistanceValue;
 			for (Fort fort : _forts.values())
 			{
 				final double distance = fort.getDistance(obj);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
index 2faf13199d..c014787c05 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/games/Lottery.java
@@ -392,18 +392,20 @@ public class Lottery
 		}
 	}
 	
-	public int[] decodeNumbers(int enchant, int type2)
+	public int[] decodeNumbers(int enchantValue, int type2Value)
 	{
 		final int[] res = new int[5];
 		int id = 0;
 		int nr = 1;
 		
+		int enchant = enchantValue;
 		while (enchant > 0)
 		{
 			final int val = enchant / 2;
-			if (val != Math.round((double) enchant / 2))
+			if (val != ((double) enchant / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			enchant /= 2;
 			nr++;
@@ -411,12 +413,14 @@ public class Lottery
 		
 		nr = 17;
 		
+		int type2 = type2Value;
 		while (type2 > 0)
 		{
 			final int val = type2 / 2;
 			if (val != ((double) type2 / 2))
 			{
-				res[id++] = nr;
+				res[id] = nr;
+				id++;
 			}
 			type2 /= 2;
 			nr++;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
index e5518154d9..d5bf0dd361 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Party.java
@@ -826,17 +826,17 @@ public class Party extends AbstractPlayerGroup
 	 * <li>Get the PlayerInstance owner of the ServitorInstance (if necessary)</li>
 	 * <li>Calculate the Experience and SP reward distribution rate</li>
 	 * <li>Add Experience and SP to the PlayerInstance</li><br>
-	 * @param xpReward The Experience reward to distribute
-	 * @param spReward The SP reward to distribute
+	 * @param xpRewardValue The Experience reward to distribute
+	 * @param spRewardValue The SP reward to distribute
 	 * @param rewardedMembers The list of PlayerInstance to reward
 	 * @param topLvl
 	 * @param target
 	 */
-	public void distributeXpAndSp(double xpReward, double spReward, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
+	public void distributeXpAndSp(double xpRewardValue, double spRewardValue, List<PlayerInstance> rewardedMembers, int topLvl, Attackable target)
 	{
 		final List<PlayerInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
-		xpReward *= getExpBonus(validMembers.size(), target.getInstanceWorld());
-		spReward *= getSpBonus(validMembers.size(), target.getInstanceWorld());
+		double xpReward = xpRewardValue * getExpBonus(validMembers.size(), target.getInstanceWorld());
+		double spReward = spRewardValue * getSpBonus(validMembers.size(), target.getInstanceWorld());
 		int sqLevelSum = 0;
 		for (PlayerInstance member : validMembers)
 		{
@@ -892,10 +892,10 @@ public class Party extends AbstractPlayerGroup
 		}
 	}
 	
-	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExp, double addSp, boolean vit)
+	private double calculateExpSpPartyCutoff(PlayerInstance player, int topLvl, double addExpValue, double addSpValue, boolean vit)
 	{
-		addExp *= Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
-		addSp *= Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addExp = addExpValue * Config.EXP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
+		final double addSp = addSpValue * Config.SP_AMOUNT_MULTIPLIERS.getOrDefault(player.getClassId(), 1f);
 		double xp = addExp;
 		double sp = addSp;
 		if (Config.PARTY_XP_CUTOFF_METHOD.equalsIgnoreCase("highfive"))
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java
index 448ce35e22..0c1524f59b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/Petition.java
@@ -48,7 +48,7 @@ public class Petition
 	public Petition(PlayerInstance petitioner, String petitionText, int petitionType)
 	{
 		_id = IdFactory.getNextId();
-		_type = PetitionType.values()[--petitionType];
+		_type = PetitionType.values()[petitionType - 1];
 		_content = petitionText;
 		_petitioner = petitioner;
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
index adc7402c47..18e793a718 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -187,25 +187,28 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	{
 		synchronized (this)
 		{
-			if (x > World.MAP_MAX_X)
+			int spawnX = x;
+			if (spawnX > World.MAP_MAX_X)
 			{
-				x = World.MAP_MAX_X - 5000;
+				spawnX = World.MAP_MAX_X - 5000;
 			}
-			if (x < World.MAP_MIN_X)
+			if (spawnX < World.MAP_MIN_X)
 			{
-				x = World.MAP_MIN_X + 5000;
+				spawnX = World.MAP_MIN_X + 5000;
 			}
-			if (y > World.MAP_MAX_Y)
+			
+			int spawnY = y;
+			if (spawnY > World.MAP_MAX_Y)
 			{
-				y = World.MAP_MAX_Y - 5000;
+				spawnY = World.MAP_MAX_Y - 5000;
 			}
-			if (y < World.MAP_MIN_Y)
+			if (spawnY < World.MAP_MIN_Y)
 			{
-				y = World.MAP_MIN_Y + 5000;
+				spawnY = World.MAP_MIN_Y + 5000;
 			}
 			
 			// Set the x,y,z position of the WorldObject. If flagged with _isSpawned, setXYZ will automatically update world region, so avoid that.
-			setXYZ(x, y, z);
+			setXYZ(spawnX, spawnY, z);
 		}
 		
 		// Spawn and update its _worldregion
@@ -502,24 +505,27 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	
 	public void setXYZInvisible(int x, int y, int z)
 	{
-		if (x > World.MAP_MAX_X)
+		int correctX = x;
+		if (correctX > World.MAP_MAX_X)
 		{
-			x = World.MAP_MAX_X - 5000;
+			correctX = World.MAP_MAX_X - 5000;
 		}
-		if (x < World.MAP_MIN_X)
+		if (correctX < World.MAP_MIN_X)
 		{
-			x = World.MAP_MIN_X + 5000;
-		}
-		if (y > World.MAP_MAX_Y)
-		{
-			y = World.MAP_MAX_Y - 5000;
-		}
-		if (y < World.MAP_MIN_Y)
-		{
-			y = World.MAP_MIN_Y + 5000;
+			correctX = World.MAP_MIN_X + 5000;
 		}
 		
-		setXYZ(x, y, z);
+		int correctY = y;
+		if (correctY > World.MAP_MAX_Y)
+		{
+			correctY = World.MAP_MAX_Y - 5000;
+		}
+		if (correctY < World.MAP_MIN_Y)
+		{
+			correctY = World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(correctX, correctY, z);
 		setSpawned(false);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index a2d0913b21..8b49ce210c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -676,12 +676,13 @@ public class Attackable extends Npc
 	
 	/**
 	 * Add damage and hate to the attacker AggroInfo of the Attackable _aggroList.
-	 * @param attacker The Creature that gave damages to this Attackable
+	 * @param creature The Creature that gave damages to this Attackable
 	 * @param damage The number of damages given by the attacker Creature
-	 * @param aggro The hate (=damage) given by the attacker Creature
+	 * @param aggroValue The hate (=damage) given by the attacker Creature
 	 */
-	public void addDamageHate(Creature attacker, int damage, int aggro)
+	public void addDamageHate(Creature creature, int damage, int aggroValue)
 	{
+		Creature attacker = creature;
 		if ((attacker == null) || (attacker == this))
 		{
 			return;
@@ -708,6 +709,7 @@ public class Attackable extends Npc
 		// traps does not cause aggro
 		// making this hack because not possible to determine if damage made by trap
 		// so just check for triggered trap here
+		int aggro = aggroValue;
 		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered())
 		{
 			ai.addHate(aggro);
@@ -755,8 +757,7 @@ public class Attackable extends Npc
 				ai.addHate(amount);
 			}
 			
-			amount = getHating(mostHated);
-			if (amount >= 0)
+			if (getHating(mostHated) >= 0)
 			{
 				((AttackableAI) getAI()).setGlobalAggro(-25);
 				clearAggroList();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index ad1c29f15c..1676afdd9f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -177,6 +177,7 @@ import org.l2jmobius.gameserver.util.Util;
 public abstract class Creature extends WorldObject implements ISkillsHolder, IDeletable
 {
 	public static final Logger LOGGER = Logger.getLogger(Creature.class.getName());
+	
 	private Set<WeakReference<Creature>> _attackByList;
 	
 	private boolean _isDead = false;
@@ -689,7 +690,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all Creature called _statusListener that must be informed of HP/MP updates of this Creature</li>
 	 * </ul>
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND CP information</b></font>
-	 * @param caster TODO
+	 * @param caster
 	 */
 	public void broadcastStatusUpdate(Creature caster)
 	{
@@ -727,14 +728,20 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>Send a Server->Client packet TeleportToLocationt to the Creature AND to all PlayerInstance in its _KnownPlayers</li>
 	 * <li>Modify the position of the pet if necessary</li>
 	 * </ul>
-	 * @param x
-	 * @param y
-	 * @param z
-	 * @param heading
-	 * @param instance
+	 * @param xValue
+	 * @param yValue
+	 * @param zValue
+	 * @param headingValue
+	 * @param instanceValue
 	 */
-	public void teleToLocation(int x, int y, int z, int heading, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int zValue, int headingValue, Instance instanceValue)
 	{
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int heading = headingValue;
+		Instance instance = instanceValue;
+		
 		final LocationReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureTeleport(this, x, y, z, heading, instance), this, LocationReturn.class);
 		if (term != null)
 		{
@@ -837,8 +844,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		teleToLocation(x, y, z, heading, randomOffset, getInstanceWorld());
 	}
 	
-	public void teleToLocation(int x, int y, int z, int heading, int randomOffset, Instance instance)
+	public void teleToLocation(int xValue, int yValue, int z, int heading, int randomOffset, Instance instance)
 	{
+		int x = xValue;
+		int y = yValue;
 		if (Config.OFFSET_ON_TELEPORT_ENABLED && (randomOffset > 0))
 		{
 			x += Rnd.get(-randomOffset, randomOffset);
@@ -1201,7 +1210,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		
 		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
 		int attackCountMax = (int) _stat.getValue(Stat.ATTACK_COUNT_MAX, 1);
-		if ((attackCountMax > 1) && !(_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) > 0))
+		if ((attackCountMax > 1) && (_stat.getValue(Stat.PHYSICAL_POLEARM_TARGET_SINGLE, 0) <= 0))
 		{
 			final double headingAngle = Util.convertHeadingToDegree(getHeading());
 			final int maxRadius = _stat.getPhysicalAttackRadius();
@@ -1246,11 +1255,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return attack;
 	}
 	
-	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumed, boolean halfDamage)
+	private Hit generateHit(Creature target, Weapon weapon, boolean shotConsumedValue, boolean halfDamage)
 	{
 		int damage = 0;
 		byte shld = 0;
 		boolean crit = false;
+		boolean shotConsumed = shotConsumedValue;
 		final boolean miss = Formulas.calcHitMiss(this, target);
 		if (!shotConsumed)
 		{
@@ -3151,9 +3161,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	{
 		if ((object != null) && !object.isSpawned())
 		{
-			object = null;
+			_target = null;
+			return;
 		}
-		
 		_target = object;
 	}
 	
@@ -3204,12 +3214,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(WorldObject), onIntentionInteract(WorldObject)</li>
 	 * <li>FollowTask</li>
 	 * </ul>
-	 * @param x The X position of the destination
-	 * @param y The Y position of the destination
-	 * @param z The Y position of the destination
-	 * @param offset The size of the interaction area of the Creature targeted
+	 * @param xValue The X position of the destination
+	 * @param yValue The Y position of the destination
+	 * @param zValue The Y position of the destination
+	 * @param offsetValue The size of the interaction area of the Creature targeted
 	 */
-	public void moveToLocation(int x, int y, int z, int offset)
+	public void moveToLocation(int xValue, int yValue, int zValue, int offsetValue)
 	{
 		// Get the Move Speed of the Creature
 		final double speed = _stat.getMoveSpeed();
@@ -3218,6 +3228,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			return;
 		}
 		
+		int x = xValue;
+		int y = yValue;
+		int z = zValue;
+		int offset = offsetValue;
+		
 		// Get current position of the Creature
 		final int curX = getX();
 		final int curY = getY();
@@ -3995,13 +4010,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * <ul>
 	 * <li>PlayerInstance : Save update in the character_skills table of the database</li>
 	 * </ul>
-	 * @param newSkill The Skill to add to the Creature
+	 * @param skill The Skill to add to the Creature
 	 * @return The Skill replaced or null if just added a new Skill
 	 */
 	@Override
-	public Skill addSkill(Skill newSkill)
+	public Skill addSkill(Skill skill)
 	{
 		Skill oldSkill = null;
+		Skill newSkill = skill;
 		if (newSkill != null)
 		{
 			// Mobius: Keep sublevel on skill level increase.
@@ -4353,7 +4369,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		_status.addStatusListener(object);
 	}
 	
-	public void doAttack(double damage, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void doAttack(double damageValue, Creature target, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
 		// Check if fake players should aggro each other.
 		if (isFakePlayer() && !Config.FAKE_PLAYER_AGGRO_FPC && target.isFakePlayer())
@@ -4371,6 +4387,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		getAI().clientStartAutoAttack();
 		
 		// ImmobileDamageBonus and ImmobileDamageResist effect bonuses.
+		double damage = damageValue;
 		if (target.isImmobilized())
 		{
 			damage *= _stat.getValue(Stat.IMMOBILE_DAMAGE_BONUS, 1);
@@ -4479,20 +4496,22 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill)
+	public void reduceCurrentHp(double amount, Creature attacker, Skill skill)
 	{
-		reduceCurrentHp(value, attacker, skill, false, false, false, false);
+		reduceCurrentHp(amount, attacker, skill, false, false, false, false);
 	}
 	
-	public void reduceCurrentHp(double value, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
+	public void reduceCurrentHp(double amountValue, Creature attacker, Skill skill, boolean isDOT, boolean directlyToHp, boolean critical, boolean reflect)
 	{
+		double amount = amountValue;
+		
 		// Notify of this attack only if there is an attacking creature.
 		if (attacker != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, value, skill, critical, isDOT, reflect), attacker);
+			EventDispatcher.getInstance().notifyEventAsync(new OnCreatureDamageDealt(attacker, this, amount, skill, critical, isDOT, reflect), attacker);
 		}
 		
-		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, value, skill, critical, isDOT, reflect), this, DamageReturn.class);
+		final DamageReturn term = EventDispatcher.getInstance().notifyEvent(new OnCreatureDamageReceived(attacker, this, amount, skill, critical, isDOT, reflect), this, DamageReturn.class);
 		if (term != null)
 		{
 			if (term.terminate())
@@ -4501,14 +4520,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			}
 			else if (term.override())
 			{
-				value = term.getDamage();
+				amount = term.getDamage();
 			}
 		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)
 		{
-			value = Math.min(value, damageCap);
+			amount = Math.min(amount, damageCap);
 		}
 		
 		// Calculate PvP/PvE damage received. It is a post-attack stat.
@@ -4516,36 +4535,36 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		{
 			if (attacker.isPlayable())
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVP_DAMAGE_TAKEN), -80)) / 100;
 			}
 			else
 			{
-				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
+				amount *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN), -80)) / 100;
 			}
 		}
 		
 		if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
 		{
-			_status.reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		else if (isPlayer())
 		{
-			getActingPlayer().getStatus().reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
+			getActingPlayer().getStatus().reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false, directlyToHp);
 		}
 		else
 		{
-			_status.reduceHp(value, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
+			_status.reduceHp(amount, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
 		}
 		
 		if (attacker != null)
 		{
-			attacker.sendDamageMessage(this, skill, (int) value, critical, false);
+			attacker.sendDamageMessage(this, skill, (int) amount, critical, false);
 		}
 	}
 	
-	public void reduceCurrentMp(double i)
+	public void reduceCurrentMp(double amount)
 	{
-		_status.reduceMp(i);
+		_status.reduceMp(amount);
 	}
 	
 	@Override
@@ -5049,8 +5068,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final List<SkillCaster> getSkillCasters(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -5059,8 +5079,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	}
 	
 	@SafeVarargs
-	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filter, Predicate<SkillCaster>... filters)
+	public final SkillCaster getSkillCaster(Predicate<SkillCaster> filterValue, Predicate<SkillCaster>... filters)
 	{
+		Predicate<SkillCaster> filter = filterValue;
 		for (Predicate<SkillCaster> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
index e528a65d34..afd7061fbc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortCommanderInstance.java
@@ -107,8 +107,9 @@ public class FortCommanderInstance extends DefenderInstance
 	}
 	
 	@Override
-	public void addDamage(Creature attacker, int damage, Skill skill)
+	public void addDamage(Creature creature, int damage, Skill skill)
 	{
+		Creature attacker = creature;
 		final Spawn spawn = getSpawn();
 		if ((spawn != null) && canTalk())
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
index d359c8335b..6b8421cb10 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
@@ -149,13 +149,14 @@ public class GuardInstance extends Attackable
 	 * @param player The PlayerInstance that start an action on the GuardInstance
 	 */
 	@Override
-	public void onAction(PlayerInstance player, boolean interact)
+	public void onAction(PlayerInstance player, boolean interactValue)
 	{
 		if (!canTarget(player))
 		{
 			return;
 		}
 		
+		boolean interact = interactValue;
 		if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME))))
 		{
 			interact = false;
@@ -213,6 +214,7 @@ public class GuardInstance extends Attackable
 				}
 			}
 		}
+		
 		// Send a Server->Client ActionFailed to the PlayerInstance in order to avoid that the client wait another packet
 		player.sendPacket(ActionFailed.STATIC_PACKET);
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index e4a3b06ba0..f15d6d3e54 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -799,9 +799,9 @@ public class PetInstance extends Summon
 		}
 	}
 	
-	public void dropItemHere(ItemInstance dropit, boolean protect)
+	public void dropItemHere(ItemInstance item, boolean protect)
 	{
-		dropit = _inventory.dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		final ItemInstance dropit = _inventory.dropItem("Drop", item.getObjectId(), item.getCount(), getOwner(), this);
 		if (dropit != null)
 		{
 			if (protect)
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 23c59b0496..e24d0f0729 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -1984,13 +1984,15 @@ public class PlayerInstance extends Playable
 	
 	/**
 	 * Set the reputation of the PlayerInstance and send a Server->Client packet StatusUpdate (broadcast).
-	 * @param reputation
+	 * @param value
 	 */
 	@Override
-	public void setReputation(int reputation)
+	public void setReputation(int value)
 	{
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), reputation), this);
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerReputationChanged(this, getReputation(), value), this);
+		
+		int reputation = value;
 		if (reputation > Config.MAX_REPUTATION) // Max count of positive reputation
 		{
 			reputation = Config.MAX_REPUTATION;
@@ -2672,12 +2674,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setExp(long exp)
 	{
-		if (exp < 0)
-		{
-			exp = 0;
-		}
-		
-		getStat().setExp(exp);
+		getStat().setExp(Math.max(0, exp));
 	}
 	
 	/**
@@ -2724,12 +2721,7 @@ public class PlayerInstance extends Playable
 	 */
 	public void setSp(long sp)
 	{
-		if (sp < 0)
-		{
-			sp = 0;
-		}
-		
-		super.getStat().setSp(sp);
+		super.getStat().setSp(Math.max(0, sp));
 	}
 	
 	/**
@@ -3401,8 +3393,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean destroyItem(String process, ItemInstance item, long count, WorldObject reference, boolean sendMessage)
 	{
-		item = _inventory.destroyItem(process, item, count, this, reference);
-		if (item == null)
+		final ItemInstance destoyedItem = _inventory.destroyItem(process, item, count, this, reference);
+		if (destoyedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3415,7 +3407,7 @@ public class PlayerInstance extends Playable
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(destoyedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3429,14 +3421,14 @@ public class PlayerInstance extends Playable
 			if (count > 1)
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S2_S1_S_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
 			{
 				final SystemMessage sm = new SystemMessage(SystemMessageId.S1_DISAPPEARED);
-				sm.addItemName(item);
+				sm.addItemName(destoyedItem);
 				sendPacket(sm);
 			}
 		}
@@ -3687,8 +3679,8 @@ public class PlayerInstance extends Playable
 	 */
 	public boolean dropItem(String process, ItemInstance item, WorldObject reference, boolean sendMessage, boolean protectItem)
 	{
-		item = _inventory.dropItem(process, item, this, reference);
-		if (item == null)
+		final ItemInstance droppedItem = _inventory.dropItem(process, item, this, reference);
+		if (droppedItem == null)
 		{
 			if (sendMessage)
 			{
@@ -3697,33 +3689,33 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
-		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && ((item.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !item.isEquipable()))
+		droppedItem.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		if ((Config.AUTODESTROY_ITEM_AFTER > 0) && Config.DESTROY_DROPPED_PLAYER_ITEM && !Config.LIST_PROTECTED_ITEMS.contains(droppedItem.getId()) && ((droppedItem.isEquipable() && Config.DESTROY_EQUIPABLE_PLAYER_ITEM) || !droppedItem.isEquipable()))
 		{
-			ItemsAutoDestroy.getInstance().addItem(item);
+			ItemsAutoDestroy.getInstance().addItem(droppedItem);
 		}
 		
 		// protection against auto destroy dropped item
 		if (Config.DESTROY_DROPPED_PLAYER_ITEM)
 		{
-			item.setProtected(item.isEquipable() && (!item.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
+			droppedItem.setProtected(droppedItem.isEquipable() && (!droppedItem.isEquipable() || !Config.DESTROY_EQUIPABLE_PLAYER_ITEM));
 		}
 		else
 		{
-			item.setProtected(true);
+			droppedItem.setProtected(true);
 		}
 		
 		// retail drop protection
 		if (protectItem)
 		{
-			item.getDropProtection().protect(this);
+			droppedItem.getDropProtection().protect(this);
 		}
 		
 		// Send inventory update packet
 		if (!Config.FORCE_INVENTORY_UPDATE)
 		{
 			final InventoryUpdate playerIU = new InventoryUpdate();
-			playerIU.addItem(item);
+			playerIU.addItem(droppedItem);
 			sendInventoryUpdate(playerIU);
 		}
 		else
@@ -3735,7 +3727,7 @@ public class PlayerInstance extends Playable
 		if (sendMessage)
 		{
 			final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_DROPPED_S1);
-			sm.addItemName(item);
+			sm.addItemName(droppedItem);
 			sendPacket(sm);
 		}
 		
@@ -4601,11 +4593,12 @@ public class PlayerInstance extends Playable
 	 * <li>Add the PlayerInstance to the _statusListener of the new target if it's a Creature</li>
 	 * <li>Target the new WorldObject (add the target to the PlayerInstance _target, _knownObject and PlayerInstance to _KnownObject of the WorldObject)</li>
 	 * </ul>
-	 * @param newTarget The WorldObject to target
+	 * @param worldObject The WorldObject to target
 	 */
 	@Override
-	public void setTarget(WorldObject newTarget)
+	public void setTarget(WorldObject worldObject)
 	{
+		WorldObject newTarget = worldObject;
 		if (newTarget != null)
 		{
 			final boolean isInParty = (newTarget.isPlayer() && isInParty() && _party.containsPlayer(newTarget.getActingPlayer()));
@@ -8224,38 +8217,40 @@ public class PlayerInstance extends Playable
 	@Override
 	public boolean useMagic(Skill skill, ItemInstance item, boolean forceUse, boolean dontMove)
 	{
+		Skill usedSkill = skill;
+		
 		// Passive skills cannot be used.
-		if (skill.isPassive())
+		if (usedSkill.isPassive())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
-		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && skill.hasEffectType(EffectType.TELEPORT))
+		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (getReputation() < 0) && usedSkill.hasEffectType(EffectType.TELEPORT))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// players mounted on pets cannot use any toggle skills
-		if (skill.isToggle() && isMounted())
+		if (usedSkill.isToggle() && isMounted())
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
 		}
 		
 		// Support for wizard skills with stances (Fire, Water, Wind, Earth)
-		final Skill attachedSkill = skill.getAttachedSkill(this);
+		final Skill attachedSkill = usedSkill.getAttachedSkill(this);
 		if (attachedSkill != null)
 		{
-			skill = attachedSkill;
+			usedSkill = attachedSkill;
 		}
 		
 		// ************************************* Check Player State *******************************************
 		
 		// Abnormal effects(ex : Stun, Sleep...) are checked in Creature useMagic()
-		if (!skill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
+		if (!usedSkill.canCastWhileDisabled() && (isControlBlocked() || hasBlockActions()))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8269,7 +8264,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if fishing and trying to use non-fishing skills.
-		if (isFishing() && !skill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
+		if (isFishing() && !usedSkill.hasEffectType(EffectType.FISHING, EffectType.FISHING_START))
 		{
 			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_MAY_BE_USED_AT_THIS_TIME);
 			return false;
@@ -8282,32 +8277,32 @@ public class PlayerInstance extends Playable
 			return false;
 		}
 		
-		if (isSkillDisabled(skill))
+		if (isSkillDisabled(usedSkill))
 		{
 			final SystemMessage sm;
-			if (hasSkillReuse(skill.getReuseHashCode()))
+			if (hasSkillReuse(usedSkill.getReuseHashCode()))
 			{
-				final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				final int remainingTime = (int) (getSkillRemainingReuseTime(usedSkill.getReuseHashCode()) / 1000);
 				final int hours = remainingTime / 3600;
 				final int minutes = (remainingTime % 3600) / 60;
 				final int seconds = (remainingTime % 60);
 				if (hours > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(hours);
 					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_MINUTE_S_S3_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 					sm.addInt(minutes);
 				}
 				else
 				{
 					sm = new SystemMessage(SystemMessageId.THERE_ARE_S2_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME);
-					sm.addSkillName(skill);
+					sm.addSkillName(usedSkill);
 				}
 				
 				sm.addInt(seconds);
@@ -8315,7 +8310,7 @@ public class PlayerInstance extends Playable
 			else
 			{
 				sm = new SystemMessage(SystemMessageId.S1_IS_NOT_AVAILABLE_AT_THIS_TIME_BEING_PREPARED_FOR_REUSE);
-				sm.addSkillName(skill);
+				sm.addSkillName(usedSkill);
 			}
 			
 			sendPacket(sm);
@@ -8331,20 +8326,20 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if the skill type is toggle and disable it, unless the toggle is necessary to be on.
-		if (skill.isToggle())
+		if (usedSkill.isToggle())
 		{
-			if (isAffectedBySkill(skill.getId()))
+			if (isAffectedBySkill(usedSkill.getId()))
 			{
-				if (!skill.isNecessaryToggle())
+				if (!usedSkill.isNecessaryToggle())
 				{
-					stopSkillEffects(true, skill.getId());
+					stopSkillEffects(true, usedSkill.getId());
 				}
 				sendPacket(ActionFailed.STATIC_PACKET);
 				return false;
 			}
-			else if (skill.getToggleGroupId() > 0)
+			else if (usedSkill.getToggleGroupId() > 0)
 			{
-				getEffectList().stopAllTogglesOfGroup(skill.getToggleGroupId());
+				getEffectList().stopAllTogglesOfGroup(usedSkill.getToggleGroupId());
 			}
 		}
 		
@@ -8358,9 +8353,9 @@ public class PlayerInstance extends Playable
 		
 		// ************************************* Check Target *******************************************
 		// Create and set a WorldObject containing the target of the skill
-		final WorldObject target = skill.getTarget(this, forceUse, dontMove, true);
+		final WorldObject target = usedSkill.getTarget(this, forceUse, dontMove, true);
 		final Location worldPosition = _currentSkillWorldPosition;
-		if ((skill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
+		if ((usedSkill.getTargetType() == TargetType.GROUND) && (worldPosition == null))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8374,27 +8369,27 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Check if all casting conditions are completed
-		if (!skill.checkCondition(this, target))
+		if (!usedSkill.checkCondition(this, target))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			
 			// Upon failed conditions, next action is called.
-			if ((skill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
+			if ((usedSkill.getNextAction() != NextActionType.NONE) && (target != this) && target.isAutoAttackable(this) && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)))
 			{
-				if (skill.getNextAction() == NextActionType.ATTACK)
+				if (usedSkill.getNextAction() == NextActionType.ATTACK)
 				{
 					getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
 				}
-				else if (skill.getNextAction() == NextActionType.CAST)
+				else if (usedSkill.getNextAction() == NextActionType.CAST)
 				{
-					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, false, false);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, false, false);
 				}
 			}
 			
 			return false;
 		}
 		
-		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && skill.canDoubleCast();
+		final boolean doubleCast = isAffected(EffectFlag.DOUBLE_CAST) && usedSkill.canDoubleCast();
 		
 		// If a skill is currently being used, queue this one if this is not the same
 		// In case of double casting, check if both slots are occupied, then queue skill.
@@ -8404,7 +8399,7 @@ public class PlayerInstance extends Playable
 			if (item == null)
 			{
 				// Create a new SkillDat object and queue it in the player _queuedSkill
-				setQueuedSkill(skill, item, forceUse, dontMove);
+				setQueuedSkill(usedSkill, item, forceUse, dontMove);
 			}
 			sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
@@ -8416,7 +8411,7 @@ public class PlayerInstance extends Playable
 		}
 		
 		// Notify the AI with AI_INTENTION_CAST and target
-		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target, item, forceUse, dontMove);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, usedSkill, target, item, forceUse, dontMove);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
index a3762b25e5..722ef54481 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
@@ -44,10 +44,10 @@ public class SchemeBufferInstance extends Npc
 	}
 	
 	@Override
-	public void onBypassFeedback(PlayerInstance player, String command)
+	public void onBypassFeedback(PlayerInstance player, String commandValue)
 	{
 		// Simple hack to use createscheme bypass with a space.
-		command = command.replace("createscheme ", "createscheme;");
+		final String command = commandValue.replace("createscheme ", "createscheme;");
 		
 		final StringTokenizer st = new StringTokenizer(command, ";");
 		final String currentCommand = st.nextToken();
@@ -299,10 +299,10 @@ public class SchemeBufferInstance extends Npc
 	 * @param player : The player to make checks on.
 	 * @param groupType : The group of skills to select.
 	 * @param schemeName : The scheme to make check.
-	 * @param page The page.
+	 * @param pageValue The page.
 	 * @return a String representing skills available to selection for a given groupType.
 	 */
-	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int page)
+	private String getGroupSkillList(PlayerInstance player, String groupType, String schemeName, int pageValue)
 	{
 		// Retrieve the entire skills list based on group type.
 		List<Integer> skills = SchemeBufferTable.getInstance().getSkillsIdsByType(groupType);
@@ -313,6 +313,7 @@ public class SchemeBufferInstance extends Npc
 		
 		// Calculate page number.
 		final int max = countPagesNumber(skills.size(), PAGE_LIMIT);
+		int page = pageValue;
 		if (page > max)
 		{
 			page = max;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
index 2c06bd4338..3a304a18f2 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayableStat.java
@@ -40,19 +40,20 @@ public class PlayableStat extends CreatureStat
 		super(player);
 	}
 	
-	public boolean addExp(long value)
+	public boolean addExp(long amount)
 	{
-		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + value), getActiveChar(), TerminateReturn.class);
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new OnPlayableExpChanged(getActiveChar(), getExp(), getExp() + amount), getActiveChar(), TerminateReturn.class);
 		if ((term != null) && term.terminate())
 		{
 			return false;
 		}
 		
-		if (((getExp() + value) < 0) || ((value > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
+		if (((getExp() + amount) < 0) || ((amount > 0) && (getExp() == (getExpForLevel(getMaxLevel()) - 1))))
 		{
 			return true;
 		}
 		
+		long value = amount;
 		if ((getExp() + value) >= getExpForLevel(getMaxLevel()))
 		{
 			value = getExpForLevel(getMaxLevel()) - 1 - getExp();
@@ -95,8 +96,9 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeExp(long value)
+	public boolean removeExp(long amount)
 	{
+		long value = amount;
 		if (((getExp() - value) < getExpForLevel(getLevel())) && (!Config.PLAYER_DELEVEL || (Config.PLAYER_DELEVEL && (getLevel() <= Config.DELEVEL_MINIMUM))))
 		{
 			value = getExp() - getExpForLevel(getLevel());
@@ -146,8 +148,9 @@ public class PlayableStat extends CreatureStat
 		return expRemoved || spRemoved;
 	}
 	
-	public boolean addLevel(byte value)
+	public boolean addLevel(byte amount)
 	{
+		byte value = amount;
 		if ((getLevel() + value) > (getMaxLevel() - 1))
 		{
 			if (getLevel() < (getMaxLevel() - 1))
@@ -186,19 +189,21 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean addSp(long value)
+	public boolean addSp(long amount)
 	{
-		if (value < 0)
+		if (amount < 0)
 		{
 			LOGGER.warning("wrong usage");
 			return false;
 		}
+		
 		final long currentSp = getSp();
 		if (currentSp >= Config.MAX_SP)
 		{
 			return false;
 		}
 		
+		long value = amount;
 		if (currentSp > (Config.MAX_SP - value))
 		{
 			value = Config.MAX_SP - currentSp;
@@ -208,14 +213,15 @@ public class PlayableStat extends CreatureStat
 		return true;
 	}
 	
-	public boolean removeSp(long value)
+	public boolean removeSp(long amount)
 	{
 		final long currentSp = getSp();
-		if (currentSp < value)
+		if (currentSp < amount)
 		{
-			value = currentSp;
+			setSp(getSp() - currentSp);
+			return true;
 		}
-		setSp(getSp() - value);
+		setSp(getSp() - amount);
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
index 643dc067fd..688922f124 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
@@ -97,7 +97,7 @@ public class PlayerStat extends PlayableStat
 		return true;
 	}
 	
-	public void addExpAndSp(double addToExp, double addToSp, boolean useBonuses)
+	public void addExpAndSp(double addToExpValue, double addToSpValue, boolean useBonuses)
 	{
 		final PlayerInstance player = getActiveChar();
 		
@@ -107,6 +107,9 @@ public class PlayerStat extends PlayableStat
 			return;
 		}
 		
+		double addToExp = addToExpValue;
+		double addToSp = addToSpValue;
+		
 		// Premium rates
 		if (player.hasPremiumStatus())
 		{
@@ -407,18 +410,19 @@ public class PlayerStat extends PlayableStat
 	@Override
 	public void setLevel(byte value)
 	{
-		if (value > (ExperienceData.getInstance().getMaxLevel() - 1))
+		byte level = value;
+		if (level > (ExperienceData.getInstance().getMaxLevel() - 1))
 		{
-			value = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
+			level = (byte) (ExperienceData.getInstance().getMaxLevel() - 1);
 		}
 		
 		if (getActiveChar().isSubClassActive())
 		{
-			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(value);
+			getActiveChar().getSubClasses().get(getActiveChar().getClassIndex()).setLevel(level);
 		}
 		else
 		{
-			super.setLevel(value);
+			super.setLevel(level);
 		}
 	}
 	
@@ -485,9 +489,9 @@ public class PlayerStat extends PlayableStat
 	/*
 	 * Set current vitality points to this value if quiet = true - does not send system messages
 	 */
-	public void setVitalityPoints(int points, boolean quiet)
+	public void setVitalityPoints(int value, boolean quiet)
 	{
-		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		final int points = Math.min(Math.max(value, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
 		if (points == getVitalityPoints())
 		{
 			return;
@@ -528,13 +532,14 @@ public class PlayerStat extends PlayableStat
 		}
 	}
 	
-	public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
+	public synchronized void updateVitalityPoints(int value, boolean useRates, boolean quiet)
 	{
-		if ((points == 0) || !Config.ENABLE_VITALITY)
+		if ((value == 0) || !Config.ENABLE_VITALITY)
 		{
 			return;
 		}
 		
+		int points = value;
 		if (useRates)
 		{
 			if (getActiveChar().isLucky())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
index 95e75e319e..dce1480534 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/PlayerStatus.java
@@ -123,7 +123,8 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		int fullValue = (int) value;
+		double amount = value;
+		int fullValue = (int) amount;
 		int tDmg = 0;
 		int mpDam = 0;
 		if ((attacker != null) && (attacker != getActiveChar()))
@@ -159,27 +160,27 @@ public class PlayerStatus extends PlayableStatus
 			final Summon summon = getActiveChar().getFirstServitor();
 			if ((summon != null) && Util.checkIfInRange(1000, getActiveChar(), summon, true))
 			{
-				tDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
+				tDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_SUMMON_PERCENT, 0)) / 100;
 				
 				// Only transfer dmg up to current HP, it should not be killed
 				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
 				if (tDmg > 0)
 				{
 					summon.reduceCurrentHp(tDmg, attacker, null);
-					value -= tDmg;
-					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+					amount -= tDmg;
+					fullValue = (int) amount; // reduce the announced value here as player will get a message about summon damage
 				}
 			}
 			
-			mpDam = ((int) value * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
+			mpDam = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.MANA_SHIELD_PERCENT, 0)) / 100;
 			if (mpDam > 0)
 			{
-				mpDam = (int) (value - mpDam);
+				mpDam = (int) (amount - mpDam);
 				if (mpDam > getActiveChar().getCurrentMp())
 				{
 					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_AND_THE_ARCANE_SHIELD_IS_DISAPPEARING);
 					getActiveChar().stopSkillEffects(true, 1556);
-					value = mpDam - getActiveChar().getCurrentMp();
+					amount = mpDam - getActiveChar().getCurrentMp();
 					getActiveChar().setCurrentMp(0);
 				}
 				else
@@ -196,7 +197,7 @@ public class PlayerStatus extends PlayableStatus
 			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster))
 			{
 				int transferDmg = 0;
-				transferDmg = ((int) value * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
+				transferDmg = ((int) amount * (int) getActiveChar().getStat().getValue(Stat.TRANSFER_DAMAGE_TO_PLAYER, 0)) / 100;
 				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
 				if (transferDmg > 0)
 				{
@@ -225,22 +226,22 @@ public class PlayerStatus extends PlayableStatus
 					if (membersInRange > 0)
 					{
 						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
-						value -= transferDmg;
-						fullValue = (int) value;
+						amount -= transferDmg;
+						fullValue = (int) amount;
 					}
 				}
 			}
 			
 			if (!ignoreCP && (attacker.isPlayable() || attacker.isFakePlayer()))
 			{
-				if (_currentCp >= value)
+				if (_currentCp >= amount)
 				{
-					setCurrentCp(_currentCp - value); // Set Cp to diff of Cp vs value
-					value = 0; // No need to subtract anything from Hp
+					setCurrentCp(_currentCp - amount); // Set Cp to diff of Cp vs value
+					amount = 0; // No need to subtract anything from Hp
 				}
 				else
 				{
-					value -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
+					amount -= _currentCp; // Get diff from value vs Cp; will apply diff to Hp
 					setCurrentCp(0, false); // Set Cp to 0
 				}
 			}
@@ -277,9 +278,9 @@ public class PlayerStatus extends PlayableStatus
 			}
 		}
 		
-		if (value > 0)
+		if (amount > 0)
 		{
-			double newHp = Math.max(getCurrentHp() - value, getActiveChar().isUndying() ? 1 : 0);
+			double newHp = Math.max(getCurrentHp() - amount, getActiveChar().isUndying() ? 1 : 0);
 			if (newHp <= 0)
 			{
 				if (getActiveChar().isInDuel())
@@ -339,7 +340,7 @@ public class PlayerStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void setCurrentCp(double newCp, boolean broadcastPacket)
+	public void setCurrentCp(double value, boolean broadcastPacket)
 	{
 		// Get the Max CP of the Creature
 		final int currentCp = (int) _currentCp;
@@ -352,11 +353,7 @@ public class PlayerStatus extends PlayableStatus
 				return;
 			}
 			
-			if (newCp < 0)
-			{
-				newCp = 0;
-			}
-			
+			final double newCp = Math.max(0, value);
 			if (newCp >= maxCp)
 			{
 				// Set the RegenActive flag to false
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
index f98bcb1efb..d98a2a102e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -37,9 +37,8 @@ public class SiegeFlagStatus extends NpcStatus
 	{
 		if (getActiveChar().isAdvancedHeadquarter())
 		{
-			value /= 2.;
+			super.reduceHp(value / 2, attacker, awake, isDOT, isHpConsumption);
 		}
-		
 		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
index 4e5699e437..6c305ffe1b 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/status/SummonStatus.java
@@ -37,7 +37,7 @@ public class SummonStatus extends PlayableStatus
 	}
 	
 	@Override
-	public void reduceHp(double value, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
+	public void reduceHp(double amount, Creature attacker, boolean awake, boolean isDOT, boolean isHPConsumption)
 	{
 		if ((attacker == null) || getActiveChar().isDead())
 		{
@@ -50,6 +50,7 @@ public class SummonStatus extends PlayableStatus
 			attackerPlayer.setDuelState(Duel.DUELSTATE_INTERRUPTED);
 		}
 		
+		double value = amount;
 		final PlayerInstance caster = getActiveChar().getTransferingDamageTo();
 		if (getActiveChar().getOwner().getParty() != null)
 		{
@@ -110,6 +111,7 @@ public class SummonStatus extends PlayableStatus
 				value -= transferDmg;
 			}
 		}
+		
 		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
index 868c8125fd..fad603da78 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
@@ -942,13 +942,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		return _collisionHeightGrown;
 	}
 	
-	public static boolean isAssignableTo(Class<?> sub, Class<?> clazz)
+	public static boolean isAssignableTo(Class<?> subValue, Class<?> clazz)
 	{
 		// If clazz represents an interface
 		if (clazz.isInterface())
 		{
 			// check if obj implements the clazz interface
-			for (Class<?> interface1 : sub.getInterfaces())
+			for (Class<?> interface1 : subValue.getInterfaces())
 			{
 				if (clazz.getName().equals(interface1.getName()))
 				{
@@ -958,13 +958,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
 		}
 		else
 		{
+			Class<?> sub = subValue;
 			do
 			{
 				if (sub.getName().equals(clazz.getName()))
 				{
 					return true;
 				}
-				
 				sub = sub.getSuperclass();
 			}
 			while (sub != null);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
index 8e382665f8..3e7d4cfd69 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/base/SubClass.java
@@ -98,9 +98,9 @@ public class SubClass
 	{
 		if (!_dualClass && (expValue > (ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1)))
 		{
-			expValue = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			_exp = ExperienceData.getInstance().getExpForLevel(MAX_LEVEL + 1) - 1;
+			return;
 		}
-		
 		_exp = expValue;
 	}
 	
@@ -128,13 +128,14 @@ public class SubClass
 	{
 		if (!_dualClass && (levelValue > MAX_LEVEL))
 		{
-			levelValue = MAX_LEVEL;
+			_level = MAX_LEVEL;
+			return;
 		}
 		else if (levelValue < Config.BASE_SUBCLASS_LEVEL)
 		{
-			levelValue = Config.BASE_SUBCLASS_LEVEL;
+			_level = Config.BASE_SUBCLASS_LEVEL;
+			return;
 		}
-		
 		_level = levelValue;
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
index dd716f2b8b..8b4978552d 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java
@@ -1164,8 +1164,9 @@ public class Clan implements IIdentifiable, INamable
 		}
 	}
 	
-	private void storeNotice(String notice, boolean enabled)
+	private void storeNotice(String noticeValue, boolean enabled)
 	{
+		String notice = noticeValue;
 		if (notice == null)
 		{
 			notice = "";
@@ -1817,10 +1818,10 @@ public class Clan implements IIdentifiable, INamable
 		return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
 	}
 	
-	public SubPledge createSubPledge(PlayerInstance player, int pledgeType, int leaderId, String subPledgeName)
+	public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, int leaderId, String subPledgeName)
 	{
 		SubPledge subPledge = null;
-		pledgeType = getAvailablePledgeTypes(pledgeType);
+		final int pledgeType = getAvailablePledgeTypes(pledgeTypeValue);
 		if (pledgeType == 0)
 		{
 			if (pledgeType == SUBUNIT_ACADEMY)
@@ -1897,8 +1898,7 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_ROYAL1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_ROYAL2);
 				}
 				case SUBUNIT_ROYAL2:
 				{
@@ -1906,18 +1906,15 @@ public class Clan implements IIdentifiable, INamable
 				}
 				case SUBUNIT_KNIGHT1:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
 				}
 				case SUBUNIT_KNIGHT2:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
 				}
 				case SUBUNIT_KNIGHT3:
 				{
-					pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
-					break;
+					return getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
 				}
 				case SUBUNIT_KNIGHT4:
 				{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
index 78a59eb6ef..cc47d39fdc 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/cubic/CubicInstance.java
@@ -206,8 +206,9 @@ public class CubicInstance
 		}
 	}
 	
-	private void tryToUseSkill(WorldObject target, CubicSkill cubicSkill)
+	private void tryToUseSkill(WorldObject worldObject, CubicSkill cubicSkill)
 	{
+		WorldObject target = worldObject;
 		final Skill skill = cubicSkill.getSkill();
 		if ((_template.getTargetType() != CubicTargetType.MASTER) && !((_template.getTargetType() == CubicTargetType.BY_SKILL) && (cubicSkill.getTargetType() == CubicTargetType.MASTER)))
 		{
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Castle.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Castle.java
index c67b32e5be..c6b7b3aebe 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Castle.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Castle.java
@@ -282,9 +282,9 @@ public class Castle extends AbstractResidence
 	// This method add to the treasury
 	/**
 	 * Add amount to castle instance's treasury (warehouse).
-	 * @param amount
+	 * @param amountValue
 	 */
-	public void addToTreasury(long amount)
+	public void addToTreasury(long amountValue)
 	{
 		// check if owned
 		if (_ownerId <= 0)
@@ -292,6 +292,7 @@ public class Castle extends AbstractResidence
 			return;
 		}
 		
+		long amount = amountValue;
 		switch (getName().toLowerCase())
 		{
 			case "schuttgart":
@@ -328,21 +329,23 @@ public class Castle extends AbstractResidence
 				break;
 			}
 		}
+		
 		addToTreasuryNoTax(amount);
 	}
 	
 	/**
 	 * Add amount to castle instance's treasury (warehouse), no tax paying.
-	 * @param amount
+	 * @param amountValue
 	 * @return
 	 */
-	public boolean addToTreasuryNoTax(long amount)
+	public boolean addToTreasuryNoTax(long amountValue)
 	{
 		if (_ownerId <= 0)
 		{
 			return false;
 		}
 		
+		long amount = amountValue;
 		if (amount < 0)
 		{
 			amount *= -1;
@@ -372,6 +375,7 @@ public class Castle extends AbstractResidence
 		{
 			LOGGER.log(Level.WARNING, e.getMessage(), e);
 		}
+		
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java
index 8c9bbb0bc0..49a7f2865c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/entity/Hero.java
@@ -187,10 +187,10 @@ public class Hero
 		}
 	}
 	
-	private String calcFightTime(long fightTime)
+	private String calcFightTime(long fightTimeValue)
 	{
 		final String format = String.format("%%0%dd", 2);
-		fightTime /= 1000;
+		final long fightTime = fightTimeValue / 1000;
 		return String.format(format, (fightTime % 3600) / 60) + ":" + String.format(format, fightTime % 60);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
index 0cc5bc61d7..00f37d7ee0 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
@@ -2162,9 +2162,9 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Add a temporary spawn of the specified NPC.
 	 * @param summoner the NPC that requires this spawn
 	 * @param npcId the ID of the NPC to spawn
-	 * @param x the X coordinate of the spawn location
-	 * @param y the Y coordinate of the spawn location
-	 * @param z the Z coordinate (height) of the spawn location
+	 * @param xValue the X coordinate of the spawn location
+	 * @param yValue the Y coordinate of the spawn location
+	 * @param zValue the Z coordinate (height) of the spawn location
 	 * @param heading the heading of the NPC
 	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
 	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
@@ -2175,17 +2175,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * @see #addSpawn(int, int, int, int, int, boolean, long)
 	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
 	 */
-	public static Npc addSpawn(Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
+	public static Npc addSpawn(Npc summoner, int npcId, int xValue, int yValue, int zValue, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instance)
 	{
 		try
 		{
 			final Spawn spawn = new Spawn(npcId);
-			if ((x == 0) && (y == 0))
+			if ((xValue == 0) && (yValue == 0))
 			{
 				LOGGER.severe("addSpawn(): invalid spawn coordinates for NPC #" + npcId + "!");
 				return null;
 			}
 			
+			int x = xValue;
+			int y = yValue;
 			if (randomOffset)
 			{
 				int offset = Rnd.get(50, 100);
@@ -2204,7 +2206,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			
 			spawn.setInstanceId(instance);
 			spawn.setHeading(heading);
-			spawn.setXYZ(x, y, z);
+			spawn.setXYZ(x, y, zValue);
 			spawn.stopRespawn();
 			
 			final Npc npc = spawn.doSpawn(isSummonSpawn);
@@ -2556,16 +2558,16 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Give a reward to player using multipliers.
 	 * @param player the player to whom to give the item
 	 * @param itemId the ID of the item to give
-	 * @param count the amount of items to give
+	 * @param countValue the amount of items to give
 	 */
-	public static void rewardItems(PlayerInstance player, int itemId, long count)
+	public static void rewardItems(PlayerInstance player, int itemId, long countValue)
 	{
 		if (player.isSimulatingTalking())
 		{
 			return;
 		}
 		
-		if (count <= 0)
+		if (countValue <= 0)
 		{
 			return;
 		}
@@ -2576,6 +2578,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return;
 		}
 		
+		long count = countValue;
 		try
 		{
 			if (itemId == Inventory.ADENA_ID)
@@ -2846,29 +2849,29 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			return true;
 		}
 		
-		minAmount *= Config.RATE_QUEST_DROP;
-		maxAmount *= Config.RATE_QUEST_DROP;
-		dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
+		long minAmountWithBonus = (long) (minAmount * Config.RATE_QUEST_DROP);
+		long maxAmountWithBonus = (long) (maxAmount * Config.RATE_QUEST_DROP);
+		long dropChanceWithBonus = (long) (dropChance * Config.RATE_QUEST_DROP); // TODO separate configs for rate and amount
 		if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
 		{
 			if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
 			{
-				dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
 			}
 			else
 			{
-				dropChance *= Config.CHAMPION_REWARDS_CHANCE;
-				minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
-				maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
+				dropChanceWithBonus *= Config.CHAMPION_REWARDS_CHANCE;
+				minAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
+				maxAmountWithBonus *= Config.CHAMPION_REWARDS_AMOUNT;
 			}
 		}
 		
-		long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount);
+		long amountToGive = (minAmountWithBonus == maxAmountWithBonus) ? minAmountWithBonus : Rnd.get(minAmountWithBonus, maxAmountWithBonus);
 		final double random = Rnd.nextDouble();
 		// Inventory slot check (almost useless for non-stacking items)
-		if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
+		if ((dropChanceWithBonus >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId))
 		{
 			if ((limit > 0) && ((currentCount + amountToGive) > limit))
 			{
@@ -2906,10 +2909,10 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 	 * Take an amount of a specified item from player's inventory.
 	 * @param player the player whose item to take
 	 * @param itemId the ID of the item to take
-	 * @param amount the amount to take
+	 * @param amountValue the amount to take
 	 * @return {@code true} if any items were taken, {@code false} otherwise
 	 */
-	public static boolean takeItems(PlayerInstance player, int itemId, long amount)
+	public static boolean takeItems(PlayerInstance player, int itemId, long amountValue)
 	{
 		if (player.isSimulatingTalking())
 		{
@@ -2924,7 +2927,8 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 		}
 		
 		// Tests on count value in order not to have negative value
-		if ((amount < 0) || (amount > item.getCount()))
+		long amount = amountValue;
+		if ((amountValue < 0) || (amountValue > item.getCount()))
 		{
 			amount = item.getCount();
 		}
@@ -2941,6 +2945,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
 			player.sendInventoryUpdate(iu);
 			player.broadcastUserInfo();
 		}
+		
 		return player.destroyItemByItemId("Quest", itemId, amount, player, true);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
index 5c2ad6712f..cbd3fd297e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/events/EventDispatcher.java
@@ -212,11 +212,12 @@ public class EventDispatcher
 	 * @param listeners
 	 * @param event
 	 * @param returnBackClass
-	 * @param callback
+	 * @param callbackValue
 	 * @return
 	 */
-	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callback)
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, IBaseEvent event, Class<T> returnBackClass, T callbackValue)
 	{
+		T callback = callbackValue;
 		for (AbstractEventListener listener : listeners)
 		{
 			try
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
index e4ee89dfc6..1d687c1296 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/fishing/Fishing.java
@@ -286,7 +286,7 @@ public class Fishing
 		}
 	}
 	
-	private void reelIn(FishingEndReason reason, boolean consumeBait)
+	private void reelIn(FishingEndReason reasonValue, boolean consumeBait)
 	{
 		if (!_isFishing)
 		{
@@ -295,6 +295,7 @@ public class Fishing
 		
 		cancelTasks();
 		
+		FishingEndReason reason = reasonValue;
 		try
 		{
 			final ItemInstance bait = _player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
index 6fdb98f39a..71e198ea2a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
@@ -457,11 +457,12 @@ public class Instance implements IIdentifiable, INamable
 	
 	/**
 	 * @param groupName
-	 * @param filter
+	 * @param filterValue
 	 * @return {@code Stream<Npc>} of NPCs that is part of a group and matches filter specified
 	 */
-	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filter)
+	public Stream<Npc> getStreamOfGroup(String groupName, Predicate<Npc> filterValue)
 	{
+		Predicate<Npc> filter = filterValue;
 		if (filter == null)
 		{
 			filter = Objects::nonNull;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
index 8b071ffab3..50285c8e34 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -69,8 +69,9 @@ public class AuctionDateGenerator
 		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
 	}
 	
-	private long calcDestTime(long time, long date, long add)
+	private long calcDestTime(long timeValue, long date, long add)
 	{
+		long time = timeValue;
 		if (time < date)
 		{
 			time += ((date - time) / add) * add;
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 2f955e248b..e4fb5a1e1a 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
@@ -77,13 +77,14 @@ public abstract class ItemContainer
 	}
 	
 	/**
-	 * @param filter
+	 * @param filterValue
 	 * @param filters
 	 * @return the quantity of items in the inventory
 	 */
 	@SafeVarargs
-	public final int getSize(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final int getSize(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -102,13 +103,14 @@ public abstract class ItemContainer
 	
 	/**
 	 * Gets the items in inventory filtered by filter.
-	 * @param filter the filter
+	 * @param filterValue the filter
 	 * @param filters multiple filters
 	 * @return the filtered items in inventory
 	 */
 	@SafeVarargs
-	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filter, Predicate<ItemInstance>... filters)
+	public final Collection<ItemInstance> getItems(Predicate<ItemInstance> filterValue, Predicate<ItemInstance>... filters)
 	{
+		Predicate<ItemInstance> filter = filterValue;
 		for (Predicate<ItemInstance> additionalFilter : filters)
 		{
 			filter = filter.and(additionalFilter);
@@ -196,32 +198,33 @@ public abstract class ItemContainer
 	 */
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		final ItemInstance olditem = getItemByItemId(item.getId());
+		ItemInstance newItem = item;
+		final ItemInstance olditem = getItemByItemId(newItem.getId());
 		
 		// If stackable item is found in inventory just add to current quantity
 		if ((olditem != null) && olditem.isStackable())
 		{
-			final long count = item.getCount();
+			final long count = newItem.getCount();
 			olditem.changeCount(process, count, actor, reference);
 			olditem.setLastChange(ItemInstance.MODIFIED);
 			
 			// And destroys the item
-			ItemTable.getInstance().destroyItem(process, item, actor, reference);
-			item.updateDatabase();
-			item = olditem;
+			ItemTable.getInstance().destroyItem(process, newItem, actor, reference);
+			newItem.updateDatabase();
+			newItem = olditem;
 		}
 		else // If item hasn't be found in inventory, create new one
 		{
-			item.setOwnerId(process, getOwnerId(), actor, reference);
-			item.setItemLocation(getBaseLocation());
-			item.setLastChange((ItemInstance.ADDED));
+			newItem.setOwnerId(process, getOwnerId(), actor, reference);
+			newItem.setItemLocation(getBaseLocation());
+			newItem.setLastChange((ItemInstance.ADDED));
 			
 			// Add item in inventory
-			addItem(item);
+			addItem(newItem);
 		}
 		
 		refreshWeight();
-		return item;
+		return newItem;
 	}
 	
 	/**
@@ -278,13 +281,13 @@ public abstract class ItemContainer
 	 * Transfers item to another inventory
 	 * @param process string Identifier of process triggering this action
 	 * @param objectId Item Identifier of the item to be transfered
-	 * @param count Quantity of items to be transfered
+	 * @param countValue Quantity of items to be transfered
 	 * @param target the item container where the item will be moved.
 	 * @param actor Player requesting the item transfer
 	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
 	 * @return ItemInstance corresponding to the new item or the updated item in inventory
 	 */
-	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
+	public ItemInstance transferItem(String process, int objectId, long countValue, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		if (target == null)
 		{
@@ -307,6 +310,7 @@ public abstract class ItemContainer
 			}
 			
 			// Check if requested quantity is available
+			long count = countValue;
 			if (count > sourceitem.getCount())
 			{
 				count = sourceitem.getCount();
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
index 699d16e38d..34835fba92 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
@@ -379,20 +379,20 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance addItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.addItem(process, item, actor, reference);
-		if (item != null)
+		final ItemInstance addedItem = super.addItem(process, item, actor, reference);
+		if (addedItem != null)
 		{
-			if ((item.getId() == ADENA_ID) && !item.equals(_adena))
+			if ((addedItem.getId() == ADENA_ID) && !addedItem.equals(_adena))
 			{
-				_adena = item;
+				_adena = addedItem;
 			}
-			else if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena))
+			else if ((addedItem.getId() == ANCIENT_ADENA_ID) && !addedItem.equals(_ancientAdena))
 			{
-				_ancientAdena = item;
+				_ancientAdena = addedItem;
 			}
-			else if ((item.getId() == BEAUTY_TICKET_ID) && !item.equals(_beautyTickets))
+			else if ((addedItem.getId() == BEAUTY_TICKET_ID) && !addedItem.equals(_beautyTickets))
 			{
-				_beautyTickets = item;
+				_beautyTickets = addedItem;
 			}
 			
 			if (actor != null)
@@ -401,7 +401,7 @@ public class PlayerInventory extends Inventory
 				if (!Config.FORCE_INVENTORY_UPDATE)
 				{
 					final InventoryUpdate playerIU = new InventoryUpdate();
-					playerIU.addItem(item);
+					playerIU.addItem(addedItem);
 					actor.sendInventoryUpdate(playerIU);
 				}
 				else
@@ -410,11 +410,10 @@ public class PlayerInventory extends Inventory
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem());
 			}
 		}
-		
-		return item;
+		return addedItem;
 	}
 	
 	/**
@@ -498,6 +497,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -510,18 +510,19 @@ public class PlayerInventory extends Inventory
 		
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		
 		return item;
 	}
 	
 	@Override
 	public ItemInstance detachItem(String process, ItemInstance item, long count, ItemLocation newLocation, PlayerInstance actor, Object reference)
 	{
-		item = super.detachItem(process, item, count, newLocation, actor, reference);
-		if ((item != null) && (actor != null))
+		final ItemInstance detachedItem = super.detachItem(process, item, count, newLocation, actor, reference);
+		if ((detachedItem != null) && (actor != null))
 		{
 			actor.sendItemList(false);
 		}
-		return item;
+		return detachedItem;
 	}
 	
 	/**
@@ -549,7 +550,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, long count, PlayerInstance actor, Object reference)
 	{
-		item = super.destroyItem(process, item, count, actor, reference);
+		final ItemInstance destroyedItem = super.destroyItem(process, item, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -561,11 +563,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, item), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
 		}
-		return item;
+		
+		return destroyedItem;
 	}
 	
 	/**
@@ -611,7 +614,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, Object reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance droppedItem = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -623,11 +627,12 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		if (item != null)
+		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
 		}
-		return item;
+		
+		return droppedItem;
 	}
 	
 	/**
@@ -643,6 +648,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, long count, PlayerInstance actor, Object reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
index 6b3098a710..e84c9a5172 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
@@ -195,7 +195,8 @@ public class QuestState
 		
 		if (value == null)
 		{
-			value = "";
+			_vars.put(var, "");
+			return;
 		}
 		
 		_vars.put(var, value);
@@ -222,9 +223,9 @@ public class QuestState
 	 * If the key doesn't exist, the couple is added/created in the database</li>
 	 * <ul>
 	 * @param var String indicating the name of the variable for quest
-	 * @param value String indicating the value of the variable for quest
+	 * @param val String indicating the value of the variable for quest
 	 */
-	public void set(String var, String value)
+	public void set(String var, String val)
 	{
 		if (_simulated)
 		{
@@ -236,6 +237,7 @@ public class QuestState
 			_vars = new HashMap<>();
 		}
 		
+		String value = val;
 		if (value == null)
 		{
 			value = "";
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
index 2cecb3dc9f..503a54a986 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/SkillCaster.java
@@ -133,7 +133,7 @@ public class SkillCaster implements Runnable
 	/**
 	 * Checks if the caster can cast the specified skill on the given target with the selected parameters.
 	 * @param caster the creature trying to cast
-	 * @param target the selected target for cast
+	 * @param worldObject the selected target for cast
 	 * @param skill the skill being cast
 	 * @param item the reference item which requests the skill cast
 	 * @param castingType the type of casting
@@ -142,7 +142,7 @@ public class SkillCaster implements Runnable
 	 * @param castTime custom cast time in milliseconds or -1 for default.
 	 * @return {@code SkillCaster} object containing casting data if casting has started or {@code null} if casting was not started.
 	 */
-	public static SkillCaster castSkill(Creature caster, WorldObject target, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
+	public static SkillCaster castSkill(Creature caster, WorldObject worldObject, Skill skill, ItemInstance item, SkillCastingType castingType, boolean ctrlPressed, boolean shiftPressed, int castTime)
 	{
 		if ((caster == null) || (skill == null) || (castingType == null))
 		{
@@ -155,7 +155,7 @@ public class SkillCaster implements Runnable
 		}
 		
 		// Check true aiming target of the skill.
-		target = skill.getTarget(caster, target, ctrlPressed, shiftPressed, false);
+		final WorldObject target = skill.getTarget(caster, worldObject, ctrlPressed, shiftPressed, false);
 		if (target == null)
 		{
 			return null;
@@ -809,20 +809,21 @@ public class SkillCaster implements Runnable
 					creature.disableSkill(skill, skill.getReuseDelay());
 				}
 				
+				WorldObject currentTarget = target;
 				if (!ignoreTargetType)
 				{
 					final WorldObject objTarget = skill.getTarget(creature, false, false, false);
 					if ((objTarget != null) && objTarget.isCreature())
 					{
-						target = objTarget;
+						currentTarget = objTarget;
 					}
 				}
 				
-				final WorldObject[] targets = skill.getTargetsAffected(creature, target).toArray(new WorldObject[0]);
+				final WorldObject[] targets = skill.getTargetsAffected(creature, currentTarget).toArray(new WorldObject[0]);
 				
 				if (!skill.isNotBroadcastable())
 				{
-					creature.broadcastPacket(new MagicSkillUse(creature, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+					creature.broadcastPacket(new MagicSkillUse(creature, currentTarget, skill.getDisplayId(), skill.getLevel(), 0, 0));
 				}
 				
 				// Launch the magic skill and calculate its effects
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 d4380e6103..c533cfb56d 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
@@ -204,14 +204,16 @@ public class Formulas
 	
 	/**
 	 * Returns true in case of critical hit
-	 * @param rate
+	 * @param rateValue
 	 * @param skill
 	 * @param creature
 	 * @param target
 	 * @return
 	 */
-	public static boolean calcCrit(double rate, Creature creature, Creature target, Skill skill)
+	public static boolean calcCrit(double rateValue, Creature creature, Creature target, Skill skill)
 	{
+		double rate = rateValue;
+		
 		if (skill != null)
 		{
 			// Magic Critical Rate.
@@ -1238,7 +1240,7 @@ public class Formulas
 		final double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
 		if (finalExp > 0) // Received exp
 		{
-			finalExp /= Config.RATE_KARMA_LOST;
+			return (int) ((Math.abs(finalExp / Config.RATE_KARMA_LOST) / karmaLooseMul) / 30);
 		}
 		return (int) ((Math.abs(finalExp) / karmaLooseMul) / 30);
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
index eda3d6d9fa..d0202aad76 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Stat.java
@@ -325,16 +325,16 @@ public enum Stat
 	
 	public static Stat valueOfXml(String name)
 	{
-		name = name.intern();
+		String internName = name.intern();
 		for (Stat s : values())
 		{
-			if (s.getValue().equals(name))
+			if (s.getValue().equals(internName))
 			{
 				return s;
 			}
 		}
 		
-		throw new NoSuchElementException("Unknown name '" + name + "' for enum " + Stat.class.getSimpleName());
+		throw new NoSuchElementException("Unknown name '" + internName + "' for enum " + Stat.class.getSimpleName());
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
index ea43885902..dbea5efe03 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -81,7 +81,8 @@ public abstract class AbstractHtmlPacket implements IClientOutgoingPacket
 		
 		if (!html.contains("<html") && !html.startsWith("..\\L2"))
 		{
-			html = "<html><body>" + html + "</body></html>";
+			_html = "<html><body>" + html + "</body></html>";
+			return;
 		}
 		
 		_html = html;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
index 9394915cc9..63919563f6 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -46,9 +46,9 @@ public class MagicSkillLaunched implements IClientOutgoingPacket
 		_castingType = castingType;
 		if (targets == null)
 		{
-			targets = Collections.singletonList(creature);
+			_targets = Collections.singletonList(creature);
+			return;
 		}
-		
 		_targets = targets;
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
index c6d199bf6b..fe6fb95a9f 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/ScriptEngineManager.java
@@ -151,16 +151,17 @@ public class ScriptEngineManager implements IXmlReader
 		}
 	}
 	
-	public void executeScript(Path sourceFile) throws Exception
+	public void executeScript(Path sourceFiles) throws Exception
 	{
-		if (!sourceFile.isAbsolute())
+		Path path = sourceFiles;
+		if (!path.isAbsolute())
 		{
-			sourceFile = SCRIPT_FOLDER.resolve(sourceFile);
+			path = SCRIPT_FOLDER.resolve(path);
 		}
 		
-		sourceFile = sourceFile.toAbsolutePath();
+		path = path.toAbsolutePath();
 		
-		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(sourceFile);
+		final Entry<Path, Throwable> error = _javaExecutionContext.executeScript(path);
 		if (error != null)
 		{
 			throw new Exception("ScriptEngine: " + error.getKey() + " failed execution!", error.getValue());
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
index afc853e69e..254c13dcc5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/scripting/java/ScriptingFileManager.java
@@ -103,19 +103,20 @@ final class ScriptingFileManager implements StandardJavaFileManager
 			return _wrapped.getJavaFileForOutput(location, className, kind, sibling);
 		}
 		
-		if (className.contains("/"))
+		String javaName = className;
+		if (javaName.contains("/"))
 		{
-			className = className.replace('/', '.');
+			javaName = javaName.replace('/', '.');
 		}
 		
 		ScriptingOutputFileObject fileObject;
 		if (sibling != null)
 		{
-			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(Paths.get(sibling.getName()), javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		else
 		{
-			fileObject = new ScriptingOutputFileObject(null, className, className.substring(className.lastIndexOf('.') + 1));
+			fileObject = new ScriptingOutputFileObject(null, javaName, javaName.substring(javaName.lastIndexOf('.') + 1));
 		}
 		
 		_classOutputs.add(fileObject);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
index 8380ea8d78..d79ce2c74c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/security/SecondaryPasswordAuth.java
@@ -100,7 +100,7 @@ public class SecondaryPasswordAuth
 		}
 	}
 	
-	public boolean savePassword(String password)
+	public boolean savePassword(String value)
 	{
 		if (passwordExist())
 		{
@@ -109,14 +109,13 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		if (!validatePassword(password))
+		if (!validatePassword(value))
 		{
 			_activeClient.sendPacket(new Ex2ndPasswordAck(0, Ex2ndPasswordAck.WRONG_PATTERN));
 			return false;
 		}
 		
-		password = cryptPassword(password);
-		
+		final String password = cryptPassword(value);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(INSERT_PASSWORD))
 		{
@@ -173,12 +172,11 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		newPassword = cryptPassword(newPassword);
-		
+		final String password = cryptPassword(newPassword);
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement statement = con.prepareStatement(UPDATE_PASSWORD))
 		{
-			statement.setString(1, newPassword);
+			statement.setString(1, password);
 			statement.setString(2, _activeClient.getAccountName());
 			statement.setString(3, VAR_PWD);
 			statement.execute();
@@ -189,14 +187,14 @@ public class SecondaryPasswordAuth
 			return false;
 		}
 		
-		_password = newPassword;
+		_password = password;
 		_authed = false;
 		return true;
 	}
 	
-	public boolean checkPassword(String password, boolean skipAuth)
+	public boolean checkPassword(String value, boolean skipAuth)
 	{
-		password = cryptPassword(password);
+		final String password = cryptPassword(value);
 		if (!password.equals(_password))
 		{
 			_wrongAttempts++;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
index bbd4b90c50..242378ca7a 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -62,10 +62,11 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Removes the attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 */
-	public void removeAttackStanceTask(Creature actor)
+	public void removeAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
@@ -78,11 +79,12 @@ public class AttackStanceTaskManager
 	
 	/**
 	 * Checks for attack stance task.
-	 * @param actor the actor
+	 * @param creature the actor
 	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
 	 */
-	public boolean hasAttackStanceTask(Creature actor)
+	public boolean hasAttackStanceTask(Creature creature)
 	{
+		Creature actor = creature;
 		if (actor != null)
 		{
 			if (actor.isSummon())
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index 130b6aa724..f32e840220 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -136,13 +136,14 @@ public class SystemPanel extends JPanel
 	
 	static String getDurationBreakdown(long millis)
 	{
-		final long days = TimeUnit.MILLISECONDS.toDays(millis);
-		millis -= TimeUnit.DAYS.toMillis(days);
-		final long hours = TimeUnit.MILLISECONDS.toHours(millis);
-		millis -= TimeUnit.HOURS.toMillis(hours);
-		final long minutes = TimeUnit.MILLISECONDS.toMinutes(millis);
-		millis -= TimeUnit.MINUTES.toMillis(minutes);
-		final long seconds = TimeUnit.MILLISECONDS.toSeconds(millis);
+		long remaining = millis;
+		final long days = TimeUnit.MILLISECONDS.toDays(remaining);
+		remaining -= TimeUnit.DAYS.toMillis(days);
+		final long hours = TimeUnit.MILLISECONDS.toHours(remaining);
+		remaining -= TimeUnit.HOURS.toMillis(hours);
+		final long minutes = TimeUnit.MILLISECONDS.toMinutes(remaining);
+		remaining -= TimeUnit.MINUTES.toMillis(minutes);
+		final long seconds = TimeUnit.MILLISECONDS.toSeconds(remaining);
 		return (days + "d " + hours + "h " + minutes + "m " + seconds + "s");
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
index 5a7eb1a4df..3945b6ac97 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java
@@ -121,10 +121,11 @@ public class Broadcast
 	 * <font color=#FF0000><b><u>Caution</u>: This method DOESN'T SEND Server->Client packet to this Creature (to do this use method toSelfAndKnownPlayers)</b></font>
 	 * @param creature
 	 * @param mov
-	 * @param radius
+	 * @param radiusValue
 	 */
-	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 1500;
@@ -154,8 +155,9 @@ public class Broadcast
 	}
 	
 	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
-	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radius)
+	public static void toSelfAndKnownPlayersInRadius(Creature creature, IClientOutgoingPacket mov, int radiusValue)
 	{
+		int radius = radiusValue;
 		if (radius < 0)
 		{
 			radius = 600;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
index 0dae6d6875..42897ded74 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/HtmlUtil.java
@@ -145,7 +145,7 @@ public class HtmlUtil
 	/**
 	 * Gets the HTML representation of a gauge.
 	 * @param width the width
-	 * @param current the current value
+	 * @param currentValue the current value
 	 * @param max the max value
 	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
 	 * @param backgroundImage the background image
@@ -154,9 +154,9 @@ public class HtmlUtil
 	 * @param top the top adjustment
 	 * @return the HTML
 	 */
-	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
+	private static String getGauge(int width, long currentValue, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top)
 	{
-		current = Math.min(current, max);
+		final long current = Math.min(currentValue, max);
 		final StringBuilder sb = new StringBuilder();
 		sb.append("<table width=");
 		sb.append(width);
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Locator.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
index 844a7a9ffc..a35bf61ecf 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Locator.java
@@ -51,13 +51,14 @@ public class Locator
 	
 	/**
 	 * Find the directory or jar a given resource has been loaded from.
-	 * @param c the classloader to be consulted for the source.
+	 * @param classLoader the classloader to be consulted for the source.
 	 * @param resource the resource whose location is required.
 	 * @return the file with the resource source or null if we cannot determine the location.
 	 * @since Ant 1.6
 	 */
-	public static File getResourceSource(ClassLoader c, String resource)
+	public static File getResourceSource(ClassLoader classLoader, String resource)
 	{
+		ClassLoader c = classLoader;
 		if (c == null)
 		{
 			c = Locator.class.getClassLoader();
@@ -98,12 +99,13 @@ public class Locator
 	 * <p>
 	 * Swallows '%' that are not followed by two characters, doesn't deal with non-ASCII characters.
 	 * </p>
-	 * @param uri the URI designating a file in the local filesystem.
+	 * @param uriValue the URI designating a file in the local filesystem.
 	 * @return the local file system path for the file.
 	 * @since Ant 1.6
 	 */
-	public static String fromURI(String uri)
+	public static String fromURI(String uriValue)
 	{
+		String uri = uriValue;
 		URL url = null;
 		try
 		{
@@ -113,10 +115,12 @@ public class Locator
 		{
 			// Ignore malformed exception
 		}
+		
 		if ((url == null) || !("file".equals(url.getProtocol())))
 		{
 			throw new IllegalArgumentException("Can only handle valid file: URIs");
 		}
+		
 		final StringBuilder buf = new StringBuilder(url.getHost());
 		if (buf.length() > 0)
 		{
@@ -125,13 +129,12 @@ public class Locator
 		final String file = url.getFile();
 		final int queryPos = file.indexOf('?');
 		buf.append((queryPos < 0) ? file : file.substring(0, queryPos));
-		
 		uri = buf.toString().replace('/', File.separatorChar);
-		
 		if ((File.pathSeparatorChar == ';') && uri.startsWith("\\") && (uri.length() > 2) && Character.isLetter(uri.charAt(1)) && (uri.lastIndexOf(':') > -1))
 		{
 			uri = uri.substring(1);
 		}
+		
 		return decodeUri(uri);
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
index 0a81e323a3..2238b79622 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/TimeAmountInterpreter.java
@@ -71,7 +71,7 @@ public class TimeAmountInterpreter
 	 * Please keep in mind, that this method is primarily designed to be used with heap text builders. Therefore, if the given text builder throws an {@link IOException}, this exception will be wrapped in a {@link RuntimeException} and returned to the caller as an unchecked exception.
 	 * @param <T>
 	 * @param textBuilder a character sequence builder
-	 * @param timeAmount amount of time to be written
+	 * @param amount amount of time to be written
 	 * @param timeUnit unit of the given amount
 	 * @param minConsolidationUnit smallest unit to be included within the description
 	 * @param maxConsolidationUnit largest unit to be included within the description
@@ -79,10 +79,11 @@ public class TimeAmountInterpreter
 	 * @return {@code textBuilder}
 	 */
 	@SuppressWarnings("unchecked")
-	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long timeAmount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
+	private static <T extends Appendable & CharSequence> T appendConsolidated(T textBuilder, long amount, TimeUnit timeUnit, TimeUnit minConsolidationUnit, TimeUnit maxConsolidationUnit, String noTimeUsedIndicator)
 	{
 		try
 		{
+			long timeAmount = amount;
 			if (timeAmount < 1)
 			{
 				return (T) textBuilder.append(noTimeUsedIndicator);
@@ -117,6 +118,7 @@ public class TimeAmountInterpreter
 		{
 			throw new RuntimeException(e);
 		}
+		
 		return textBuilder;
 	}
 }
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
index 1d7b83de41..5e83e101aa 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Util.java
@@ -642,8 +642,7 @@ public class Util
 	 */
 	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -657,8 +656,7 @@ public class Util
 	 */
 	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
@@ -672,8 +670,7 @@ public class Util
 	 */
 	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax)
 	{
-		input = constrain(input, inputMin, inputMax);
-		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+		return (((constrain(input, inputMin, inputMax) - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
index d30d22f815..225295914c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java
@@ -272,16 +272,17 @@ public class CronParser
 	/**
 	 * Parses a crontab-like line.
 	 * @param table The table on which the parsed task will be stored, by side-effect.
-	 * @param line The crontab-like line.
+	 * @param lineValue The crontab-like line.
 	 * @throws Exception The supplied line doesn't represent a valid task line.
 	 */
-	public static void parseLine(TaskTable table, String line) throws Exception
+	public static void parseLine(TaskTable table, String lineValue) throws Exception
 	{
-		line = line.trim();
+		String line = lineValue.trim();
 		if ((line.isEmpty()) || (line.charAt(0) == '#'))
 		{
 			return;
 		}
+		
 		// Detecting the pattern.
 		int size = line.length();
 		String pattern = null;
@@ -298,8 +299,10 @@ public class CronParser
 		{
 			throw new Exception("Invalid cron line: " + line);
 		}
+		
 		line = line.substring(pattern.length());
 		size = line.length();
+		
 		// Splitting the line
 		final ArrayList<String> splitted = new ArrayList<>();
 		StringBuilder current = null;
@@ -351,6 +354,7 @@ public class CronParser
 				}
 			}
 		}
+		
 		if ((current != null) && (current.length() > 0))
 		{
 			String str = current.toString();
@@ -361,6 +365,7 @@ public class CronParser
 			splitted.add(str);
 			current = null;
 		}
+		
 		// Analyzing
 		size = splitted.size();
 		int status = 0;
@@ -377,6 +382,7 @@ public class CronParser
 		for (int i = 0; i < size; i++)
 		{
 			final String tk = splitted.get(i);
+			
 			// Check the local status.
 			if (status == 0)
 			{
@@ -424,8 +430,10 @@ public class CronParser
 				}
 			}
 		}
+		
 		// Task preparing.
 		Task task;
+		
 		// Command evaluation.
 		if (command == null)
 		{
@@ -471,6 +479,7 @@ public class CronParser
 			{
 				cmdarray[i + 1] = argsList.get(i);
 			}
+			
 			// Environments.
 			String[] envs = null;
 			size = envsList.size();
@@ -482,6 +491,7 @@ public class CronParser
 					envs[i] = envsList.get(i);
 				}
 			}
+			
 			// Working directory.
 			File dir = null;
 			if (dirString != null)
@@ -492,8 +502,10 @@ public class CronParser
 					throw new Exception("Invalid cron working directory parameter at line: " + line, new FileNotFoundException(dirString + " doesn't exist or it is not a directory"));
 				}
 			}
+			
 			// Builds the task.
 			final ProcessTask process = new ProcessTask(cmdarray, envs, dir);
+			
 			// Channels.
 			if (stdinFile != null)
 			{
@@ -509,6 +521,7 @@ public class CronParser
 			}
 			task = process;
 		}
+		
 		// End.
 		table.add(new SchedulingPattern(pattern), task);
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
index be45f3b18d..e3bca876b1 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/loginserver/LoginServer.java
@@ -145,7 +145,9 @@ public class LoginServer
 				lnr.lines()
 					.map(String::trim)
 					.filter(l -> !l.isEmpty() && (l.charAt(0) != '#'))
-					.forEach(line -> {
+					.forEach(lineValue ->
+					{
+						String line = lineValue; 
 						String[] parts = line.split("#", 2); // address[ duration][ # comments]
 						line = parts[0];
 						parts = line.split("\\s+"); // durations might be aligned via multiple spaces
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
index 4418383eb9..1f43dd8142 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/console/DBInstallerConsole.java
@@ -100,16 +100,17 @@ public class DBInstallerConsole implements DBOutputInterface
 	 */
 	public DBInstallerConsole(String defDatabase, String dir, String host, String port, String user, String pass, String database, String mode) throws Exception
 	{
-		if ((database == null) || database.isEmpty())
+		String currentDatabase = database;
+		if ((currentDatabase == null) || currentDatabase.isEmpty())
 		{
-			database = defDatabase;
+			currentDatabase = defDatabase;
 		}
 		
-		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, database, true);
+		final MySqlConnect connector = new MySqlConnect(host, port, user, pass, currentDatabase, true);
 		_con = connector.getConnection();
 		if ((mode != null) && ("c".equalsIgnoreCase(mode) || "u".equalsIgnoreCase(mode)))
 		{
-			final RunTasks rt = new RunTasks(this, database, dir);
+			final RunTasks rt = new RunTasks(this, currentDatabase, dir);
 			rt.run();
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
index 4a9c3c657e..a9f98b02a5 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/geodataconverter/GeoDataConverter.java
@@ -274,11 +274,13 @@ public class GeoDataConverter
 	 * @param x : Geodata X coordinate.
 	 * @param y : Geodata Y coordinate.
 	 * @param z : Geodata Z coordinate.
-	 * @param nswe : NSWE flag to be updated.
+	 * @param nsweValue : NSWE flag to be updated.
 	 * @return byte : Updated NSWE flag.
 	 */
-	private static byte updateNsweBelow(int x, int y, short z, byte nswe)
+	private static byte updateNsweBelow(int x, int y, short z, byte nsweValue)
 	{
+		byte nswe = nsweValue;
+		
 		// calculate virtual layer height
 		final short height = (short) (z + GeoStructure.CELL_IGNORE_HEIGHT);
 		
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
index 3887d1edfd..851282bd07 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
@@ -303,12 +303,13 @@ public abstract class BaseGameServerRegister
 		
 		/**
 		 * Show the error.
-		 * @param msg the msg
+		 * @param message the msg
 		 * @param t the t
 		 */
-		public void showError(String msg, Throwable t)
+		public void showError(String message, Throwable t)
 		{
 			String title;
+			String msg = message;
 			if (_bundle != null)
 			{
 				title = _bundle.getString("error");
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
index bc664b6468..6ed1d0c93c 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/gsregistering/GameServerRegister.java
@@ -320,7 +320,6 @@ public class GameServerRegister extends BaseGameServerRegister
 	@Override
 	public void showError(String msg, Throwable t)
 	{
-		msg += Config.EOL + "Reason: " + t.getMessage();
-		System.out.println("Error: " + msg);
+		System.out.println("Error: " + msg + Config.EOL + "Reason: " + t.getMessage());
 	}
 }
\ No newline at end of file