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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java
View File

@ -91,7 +91,7 @@ public class SummonSkillsTable
{
if (cha.getLevel() < 70)
{
lvl = (cha.getLevel() / 10);
lvl = cha.getLevel() / 10;
if (lvl <= 0)
{
lvl = 1;
@ -99,7 +99,7 @@ public class SummonSkillsTable
}
else
{
lvl = (7 + ((cha.getLevel() - 70) / 5));
lvl = 7 + ((cha.getLevel() - 70) / 5);
}
// formula usable for skill that have 10 or more skill levels

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java
View File

@ -91,7 +91,7 @@ public final class AbilityPointsData implements IXmlReader
return prevHolder != null ? prevHolder.getSP() : points >= 13 ? 1_000_000_000 : points >= 9 ? 750_000_000 : points >= 5 ? 500_000_000 : 250_000_000;
}
public static final AbilityPointsData getInstance()
public static AbilityPointsData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java
View File

@ -141,7 +141,7 @@ public class AppearanceItemData implements IXmlReader
* Gets the single instance of AppearanceItemData.
* @return single instance of AppearanceItemData
*/
public static final AppearanceItemData getInstance()
public static AppearanceItemData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java
View File

@ -124,7 +124,7 @@ public final class BeautyShopData implements IXmlReader
att = attrs.item(i);
set.set(att.getNodeName(), att.getNodeValue());
}
beautyData.addFace((new BeautyItem(set)));
beautyData.addFace(new BeautyItem(set));
}
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemBonusData.java
View File

@ -190,7 +190,7 @@ public class EnchantItemBonusData implements IXmlReader
* Gets the single instance of EnchantBonusData.
* @return single instance of EnchantBonusData
*/
public static final EnchantItemBonusData getInstance()
public static EnchantItemBonusData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
View File

@ -153,7 +153,7 @@ public class EnchantItemData implements IXmlReader
* Gets the single instance of EnchantItemData.
* @return single instance of EnchantItemData
*/
public static final EnchantItemData getInstance()
public static EnchantItemData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java
View File

@ -112,7 +112,7 @@ public class EnchantItemOptionsData implements IXmlReader
* Gets the single instance of EnchantOptionsData.
* @return single instance of EnchantOptionsData
*/
public static final EnchantItemOptionsData getInstance()
public static EnchantItemOptionsData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystalizationData.java
View File

@ -84,7 +84,7 @@ public final class ItemCrystalizationData implements IXmlReader
* Gets the single instance of ItemCrystalizationData.
* @return single instance of ItemCrystalizationData
*/
public static final ItemCrystalizationData getInstance()
public static ItemCrystalizationData getInstance()
{
return SingletonHolder._instance;
}

8
trunk/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@ -271,7 +271,7 @@ public final class MultisellData implements IXmlReader
separateAndSend(listId, player, npc, inventoryOnly, 1, 1);
}
public static final boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
{
switch (id)
{
@ -324,13 +324,13 @@ public final class MultisellData implements IXmlReader
return false;
}
public static final boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
{
switch (id)
{
case PC_BANG_POINTS: // PcBang points
{
final int cost = player.getPcBangPoints() - (int) (amount);
final int cost = player.getPcBangPoints() - (int) amount;
player.setPcBangPoints(cost);
final SystemMessage smsgpc = SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_USING_S1_POINT);
smsgpc.addLong((int) amount);
@ -362,7 +362,7 @@ public final class MultisellData implements IXmlReader
return false;
}
public static final void giveSpecialProduct(int id, long amount, L2PcInstance player)
public static void giveSpecialProduct(int id, long amount, L2PcInstance player)
{
switch (id)
{

89
trunk/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
View File

@ -550,54 +550,51 @@ public class NpcData implements IXmlReader
aiSkillScopes.add(shortOrLongRangeScope);
}
}
else if (skill.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
{
aiSkillScopes.add(AISkillScope.NEGATIVE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.HEAL))
{
aiSkillScopes.add(AISkillScope.HEAL);
}
else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
{
aiSkillScopes.add(AISkillScope.ATTACK);
aiSkillScopes.add(AISkillScope.UNIVERSAL);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.SLEEP))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
}
else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.MUTE, L2EffectType.FEAR))
{
aiSkillScopes.add(AISkillScope.COT);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.PARALYZE))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
{
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.RESURRECTION))
{
aiSkillScopes.add(AISkillScope.RES);
}
else
{
if (skill.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
{
aiSkillScopes.add(AISkillScope.NEGATIVE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.HEAL))
{
aiSkillScopes.add(AISkillScope.HEAL);
}
else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN))
{
aiSkillScopes.add(AISkillScope.ATTACK);
aiSkillScopes.add(AISkillScope.UNIVERSAL);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.SLEEP))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
}
else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.MUTE, L2EffectType.FEAR))
{
aiSkillScopes.add(AISkillScope.COT);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.PARALYZE))
{
aiSkillScopes.add(AISkillScope.IMMOBILIZE);
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT))
{
aiSkillScopes.add(shortOrLongRangeScope);
}
else if (skill.hasEffectType(L2EffectType.RESURRECTION))
{
aiSkillScopes.add(AISkillScope.RES);
}
else
{
aiSkillScopes.add(AISkillScope.UNIVERSAL);
}
aiSkillScopes.add(AISkillScope.UNIVERSAL);
}
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java
View File

@ -149,7 +149,7 @@ public class OptionData implements IXmlReader
* Gets the single instance of OptionsData.
* @return single instance of OptionsData
*/
public static final OptionData getInstance()
public static OptionData getInstance()
{
return SingletonHolder._instance;
}

8
trunk/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java
View File

@ -128,7 +128,7 @@ public final class PlayerTemplateData implements IXmlReader
}
else if (!cnd.getNodeName().equals("#text"))
{
set.set((nd.getNodeName() + cnd.getNodeName()), cnd.getTextContent());
set.set(nd.getNodeName() + cnd.getNodeName(), cnd.getTextContent());
}
}
}
@ -138,8 +138,8 @@ public final class PlayerTemplateData implements IXmlReader
}
}
// calculate total pdef and mdef from parts
set.set("basePDef", (set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0)));
set.set("baseMDef", (set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0)));
set.set("basePDef", set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0));
set.set("baseMDef", set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0));
_playerTemplates.put(ClassId.getClassId(classId), new L2PcTemplate(set, creationPoints));
}
@ -180,7 +180,7 @@ public final class PlayerTemplateData implements IXmlReader
return _playerTemplates.get(ClassId.getClassId(classId));
}
public static final PlayerTemplateData getInstance()
public static PlayerTemplateData getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
View File

@ -110,7 +110,7 @@ public class SiegeScheduleData implements IXmlReader
return _scheduleData;
}
public static final SiegeScheduleData getInstance()
public static SiegeScheduleData getInstance()
{
return SingletonHolder._instance;
}

16
trunk/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java
View File

@ -697,7 +697,7 @@ public final class SkillTreesData implements IXmlReader
continue;
}
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId()))
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId()))
{
continue;
}
@ -750,7 +750,7 @@ public final class SkillTreesData implements IXmlReader
continue;
}
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId()))
if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId()))
{
continue;
}
@ -835,7 +835,7 @@ public final class SkillTreesData implements IXmlReader
final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getSkillId());
final int hashCode = SkillData.getSkillHashCode(skill.getSkillId(), maxLvl);
if (skill.isAutoGet() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())))
if (skill.isAutoGet() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))
{
final Skill oldSkill = player.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
@ -871,7 +871,7 @@ public final class SkillTreesData implements IXmlReader
continue;
}
if (skill.isLearnedByNpc() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())))
if (skill.isLearnedByNpc() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))
{
final Skill oldSkill = player.getSkills().get(skill.getSkillId());
if (oldSkill != null)
@ -922,7 +922,7 @@ public final class SkillTreesData implements IXmlReader
for (L2SkillLearn skill : _alchemySkillTree.values())
{
if (skill.isLearnedByNpc() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())))
if (skill.isLearnedByNpc() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))
{
final Skill oldSkill = player.getSkills().get(skill.getSkillId());
@ -1005,7 +1005,7 @@ public final class SkillTreesData implements IXmlReader
final Race race = player.getRace();
for (L2SkillLearn skill : _transformSkillTree.values())
{
if (((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())) && (skill.getRaces().isEmpty() || skill.getRaces().contains(race)))
if ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()) && (skill.getRaces().isEmpty() || skill.getRaces().contains(race)))
{
final Skill oldSkill = player.getSkills().get(skill.getSkillId());
if (oldSkill != null)
@ -1079,7 +1079,7 @@ public final class SkillTreesData implements IXmlReader
{
for (L2SkillLearn skill : _subPledgeSkillTree.values())
{
if ((clan.getLevel() >= skill.getGetLevel()))
if (clan.getLevel() >= skill.getGetLevel())
{
final Skill oldSkill = clan.getSkills().get(skill.getSkillId());
if ((oldSkill == null) || (oldSkill.getLevel() < skill.getSkillLevel()))
@ -1547,7 +1547,7 @@ public final class SkillTreesData implements IXmlReader
for (int i = 0; i < classlevel; i++)
{
classId = classId.getParent();
if (isCurrentClassSkillNoParent(classId, hashCurrentLevel) && (!isCurrentClassSkillNoParent(player.getClassId(), hashMaxLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashNextLevel)) && !isRemoveSkill(player.getClassId(), skill.getId()))
if (isCurrentClassSkillNoParent(classId, hashCurrentLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashMaxLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashNextLevel) && !isRemoveSkill(player.getClassId(), skill.getId()))
{
player.removeSkill(skill, true, true);
}