diff --git a/trunk/.settings/org.eclipse.jdt.core.prefs b/trunk/.settings/org.eclipse.jdt.core.prefs index 2c32b599dd..f03159d379 100644 --- a/trunk/.settings/org.eclipse.jdt.core.prefs +++ b/trunk/.settings/org.eclipse.jdt.core.prefs @@ -166,7 +166,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line @@ -210,7 +210,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java index a3fdb901bc..6a110a619a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java @@ -312,4 +312,4 @@ public final class CastleCourtMagician extends AbstractNpcAI { new CastleCourtMagician(); } -} +} diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java index f24a72fe3d..453ca1c568 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java @@ -131,4 +131,4 @@ public final class CastleMercenaryManager extends AbstractNpcAI { new CastleMercenaryManager(); } -} +} diff --git a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java index 8b5c82d699..db6993ddb8 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java +++ b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java @@ -712,7 +712,8 @@ public class EnergySeeds extends AbstractNpcAI public void scheduleRespawn(long waitTime) { - ThreadPoolManager.getInstance().scheduleGeneral(() -> { + ThreadPoolManager.getInstance().scheduleGeneral(() -> + { // if the AI is inactive, do not spawn the NPC if (isSeedActive(_seedId)) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Escape.java index 48c11ccb09..39c43eb77e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Escape.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Escape.java @@ -64,4 +64,4 @@ public final class Escape extends AbstractEffect info.getEffected().teleToLocation(MapRegionManager.getInstance().getTeleToLocation(info.getEffected(), _escapeType), true); info.getEffected().setInstanceId(0); } -} +} diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Recovery.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Recovery.java index d989d3a95c..6ea6ea42bb 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Recovery.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Recovery.java @@ -48,4 +48,4 @@ public final class Recovery extends AbstractEffect info.getEffected().getActingPlayer().decreaseShilensBreathDebuff(); } } -} +} diff --git a/trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java b/trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java index e6ce6b62f8..181549d158 100644 --- a/trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java +++ b/trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java @@ -116,4 +116,4 @@ public final class BaseTower extends AbstractNpcAI } return super.onKill(npc, killer, isSummon); } -} +} diff --git a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 2d5ccf571e..a2b8597283 100644 --- a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -865,7 +865,8 @@ public final class FinalEmperialTomb extends AbstractInstance { targetList.add(pet); } - player.getServitors().values().forEach(s -> { + player.getServitors().values().forEach(s -> + { if (!s.isDead()) { targetList.add(s); diff --git a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java index f385dfb282..8fb395c46c 100644 --- a/trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java +++ b/trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java @@ -126,4 +126,4 @@ public final class ClassListData implements IXmlReader { protected static final ClassListData _instance = new ClassListData(); } -} +} diff --git a/trunk/java/com/l2jserver/gameserver/model/CharEffectList.java b/trunk/java/com/l2jserver/gameserver/model/CharEffectList.java index 2678a25db0..d2b907dc1b 100644 --- a/trunk/java/com/l2jserver/gameserver/model/CharEffectList.java +++ b/trunk/java/com/l2jserver/gameserver/model/CharEffectList.java @@ -850,7 +850,8 @@ public final class CharEffectList public void stopEffects(L2EffectType type) { boolean update = false; - final Consumer action = info -> { + final Consumer action = info -> + { if (info.getEffects().stream().anyMatch(effect -> (effect != null) && (effect.getEffectType() == type))) { stopAndRemove(info); diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Party.java b/trunk/java/com/l2jserver/gameserver/model/L2Party.java index e388aeafcc..741bf2d92d 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Party.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Party.java @@ -364,7 +364,8 @@ public class L2Party extends AbstractPlayerGroup if (_positionBroadcastTask == null) { - _positionBroadcastTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> { + _positionBroadcastTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> + { if (_positionPacket == null) { _positionPacket = new PartyMemberPosition(this); @@ -430,7 +431,8 @@ public class L2Party extends AbstractPlayerGroup { // Otherwise, delete the old sign, and apply it to the new target _tacticalSigns.replace(tacticalSignId, target); - getMembers().forEach(m -> { + getMembers().forEach(m -> + { m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); m.sendPacket(new ExTacticalSign(target, tacticalSignId)); }); diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java index 3c5fa271be..a755946c6f 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java @@ -4311,7 +4311,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (distFraction > 1) { - ThreadPoolManager.getInstance().executeAi(() -> { + ThreadPoolManager.getInstance().executeAi(() -> + { try { if (Config.MOVE_BASED_KNOWNLIST) diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java index 9529e5995c..efc5620480 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java @@ -11150,7 +11150,8 @@ public final class L2PcInstance extends L2Playable pet.updateAndBroadcastStatus(0); } - getServitors().values().forEach(s -> { + getServitors().values().forEach(s -> + { s.setFollowStatus(false); s.teleToLocation(getLocation(), false); ((L2SummonAI) s.getAI()).setStartFollowController(true); @@ -11753,7 +11754,8 @@ public final class L2PcInstance extends L2Playable } } - getServitors().values().forEach(s -> { + getServitors().values().forEach(s -> + { s.setRestoreSummon(true); s.unSummon(this); }); diff --git a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index 48ec5a2cd1..40badedf56 100644 --- a/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -66,4 +66,4 @@ public class ConditionPlayerCanSummonPet extends Condition } return (_val == canSummon); } -} +} diff --git a/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java b/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java index 1084ed9374..165d0b04c3 100644 --- a/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java +++ b/trunk/java/com/l2jserver/gameserver/model/entity/Instance.java @@ -855,7 +855,8 @@ public final class Instance { if ((player != null)) { - _ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneral(() -> { + _ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneral(() -> + { if (player.isDead() && (player.getInstanceId() == getId())) { player.setInstanceId(0); diff --git a/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java b/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java index b586bd5d51..65fc5d2e65 100644 --- a/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java +++ b/trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java @@ -2508,14 +2508,16 @@ public abstract class AbstractScript extends ManagedScript { if (includeCommandChannel && player.getParty().isInCommandChannel()) { - player.getParty().getCommandChannel().forEachMember(member -> { + player.getParty().getCommandChannel().forEachMember(member -> + { actionForEachPlayer(member, npc, isSummon); return true; }); } else if (includeParty) { - player.getParty().forEachMember(member -> { + player.getParty().forEachMember(member -> + { actionForEachPlayer(member, npc, isSummon); return true; }); diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java index 14e0a6efcf..edc6fce823 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java @@ -710,7 +710,8 @@ public final class RequestActionUse extends L2GameClientPacket useSkill(6684, true); break; case 1099: // All servitor attack - activeChar.getServitors().values().forEach(s -> { + activeChar.getServitors().values().forEach(s -> + { if (validateSummon(s, false)) { if (s.canAttack(_ctrlPressed)) @@ -721,7 +722,8 @@ public final class RequestActionUse extends L2GameClientPacket }); break; case 1100: // All servitor move to - activeChar.getServitors().values().forEach(s -> { + activeChar.getServitors().values().forEach(s -> + { if (validateSummon(s, false)) { if ((target != null) && (s != target) && !s.isMovementDisabled()) @@ -733,7 +735,8 @@ public final class RequestActionUse extends L2GameClientPacket }); break; case 1101: // All servitor stop - activeChar.getServitors().values().forEach(summon -> { + activeChar.getServitors().values().forEach(summon -> + { if (validateSummon(summon, false)) { summon.cancelAction(); @@ -742,8 +745,7 @@ public final class RequestActionUse extends L2GameClientPacket break; case 1102: // Unsummon all servitors boolean canUnsummon = true; - OUT: - for (L2Summon s : activeChar.getServitors().values()) + OUT: for (L2Summon s : activeChar.getServitors().values()) { if (validateSummon(s, false)) { @@ -758,7 +760,8 @@ public final class RequestActionUse extends L2GameClientPacket } if (canUnsummon) { - activeChar.getServitors().values().stream().forEach(s -> { + activeChar.getServitors().values().stream().forEach(s -> + { s.unSummon(activeChar); }); } @@ -1115,7 +1118,8 @@ public final class RequestActionUse extends L2GameClientPacket return; } - activeChar.getServitors().values().forEach(servitor -> { + activeChar.getServitors().values().forEach(servitor -> + { if (!validateSummon(servitor, false)) { return; diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java index 96fbd2ff99..f0f5311357 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java @@ -98,4 +98,4 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket writeD(level); } } -} +} diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java index 69acb7f6f7..717151d882 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java @@ -18,7 +18,6 @@ */ package com.l2jserver.gameserver.network.serverpackets; - /** * @author Gnacik, UnAfraid */ diff --git a/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java b/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java index c9a61b0233..23e4c411d6 100644 --- a/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java +++ b/trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java @@ -203,7 +203,8 @@ public final class TaskManager public void registerTask(Task task) { int key = task.getName().hashCode(); - _tasks.computeIfAbsent(key, k -> { + _tasks.computeIfAbsent(key, k -> + { task.initializate(); return task; });