lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code formatter settings.

Browse Source
This commit is contained in:
mobius 2015-02-09 00:36:25 +00:00
parent 012eb3ed65
commit 855feff6f6
20 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/.settings/org.eclipse.jdt.core.prefs
View File

@ -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

2
trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java vendored
View File

@ -312,4 +312,4 @@ public final class CastleCourtMagician extends AbstractNpcAI
{
new CastleCourtMagician();
}
}
}

2
trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java vendored
View File

@ -131,4 +131,4 @@ public final class CastleMercenaryManager extends AbstractNpcAI
{
new CastleMercenaryManager();
}
}
}

3
trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java vendored
View File

@ -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))
{

2
trunk/dist/game/data/scripts/handlers/effecthandlers/Escape.java vendored
View File

@ -64,4 +64,4 @@ public final class Escape extends AbstractEffect
info.getEffected().teleToLocation(MapRegionManager.getInstance().getTeleToLocation(info.getEffected(), _escapeType), true);
info.getEffected().setInstanceId(0);
}
}
}

2
trunk/dist/game/data/scripts/handlers/effecthandlers/Recovery.java vendored
View File

@ -48,4 +48,4 @@ public final class Recovery extends AbstractEffect
info.getEffected().getActingPlayer().decreaseShilensBreathDebuff();
}
}
}
}

2
trunk/dist/game/data/scripts/hellbound/AI/Zones/BaseTower/BaseTower.java vendored
View File

@ -116,4 +116,4 @@ public final class BaseTower extends AbstractNpcAI
}
return super.onKill(npc, killer, isSummon);
}
}
}

3
trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java vendored
View File

@ -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);

2
trunk/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java
View File

@ -126,4 +126,4 @@ public final class ClassListData implements IXmlReader
{
protected static final ClassListData _instance = new ClassListData();
}
}
}

3
trunk/java/com/l2jserver/gameserver/model/CharEffectList.java
View File

@ -850,7 +850,8 @@ public final class CharEffectList
public void stopEffects(L2EffectType type)
{
boolean update = false;
final Consumer<BuffInfo> action = info -> {
final Consumer<BuffInfo> action = info ->
{
if (info.getEffects().stream().anyMatch(effect -> (effect != null) && (effect.getEffectType() == type)))
{
stopAndRemove(info);

6
trunk/java/com/l2jserver/gameserver/model/L2Party.java
View File

@ -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));
});

3
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@ -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)

6
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -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);
});

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java
View File

@ -66,4 +66,4 @@ public class ConditionPlayerCanSummonPet extends Condition
}
return (_val == canSummon);
}
}
}

3
trunk/java/com/l2jserver/gameserver/model/entity/Instance.java
View File

@ -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);

6
trunk/java/com/l2jserver/gameserver/model/events/AbstractScript.java
View File

@ -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;
});

18
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
View File

@ -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;

2
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
View File

@ -98,4 +98,4 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket
writeD(level);
}
}
}
}

1
trunk/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java
View File

@ -18,7 +18,6 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
/**
* @author Gnacik, UnAfraid
*/

3
trunk/java/com/l2jserver/gameserver/taskmanager/TaskManager.java
View File

@ -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;
});