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

Replaced qualified names with simple names.

Browse Source
This commit is contained in:
MobiusDev
2018-06-19 03:23:43 +00:00
parent a5b69096dd
commit e7606fb5ec
341 changed files with 1119 additions and 1137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java
View File

@@ -500,7 +500,7 @@ public class L2AttackableAI extends L2CharacterAI
}
// Set the AI Intention to AI_INTENTION_ATTACK
setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated);
setIntention(AI_INTENTION_ATTACK, hated);
}
return;
@@ -700,7 +700,7 @@ public class L2AttackableAI extends L2CharacterAI
// Check if the L2Object is inside the Faction Range of the actor
if ((_actor.getAttackByList() != null) && _actor.isInsideRadius(npc, npc.getFactionRange(), true, false) && (npc.getAI() != null) && _actor.getAttackByList().contains(originalAttackTarget))
{
if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE))
if ((npc.getAI().getIntention() == AI_INTENTION_IDLE) || (npc.getAI().getIntention() == AI_INTENTION_ACTIVE))
{
if (GeoData.getInstance().canSeeTarget(_actor, npc) && (Math.abs(originalAttackTarget.getZ() - npc.getZ()) < 600))
{
@@ -1080,11 +1080,11 @@ public class L2AttackableAI extends L2CharacterAI
// Set the Intention to AI_INTENTION_ATTACK
if (getIntention() != AI_INTENTION_ATTACK)
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker);
setIntention(AI_INTENTION_ATTACK, attacker);
}
else if (((L2Attackable) _actor).getMostHated() != getAttackTarget())
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker);
setIntention(AI_INTENTION_ATTACK, attacker);
}
}
@@ -1120,7 +1120,7 @@ public class L2AttackableAI extends L2CharacterAI
me.addDamageHate(target, 0, aggro);
// Set the actor AI Intention to AI_INTENTION_ATTACK
if (getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
if (getIntention() != AI_INTENTION_ATTACK)
{
// Set the L2Character movement type to run and send
// Server->Client packet ChangeMoveType to all others
@@ -1130,7 +1130,7 @@ public class L2AttackableAI extends L2CharacterAI
_actor.setRunning();
}
setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
setIntention(AI_INTENTION_ATTACK, target);
}
}
}

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2ControllableMobAI.java
View File

@@ -88,9 +88,9 @@ public class L2ControllableMobAI extends L2AttackableAI
{
case AI_IDLE:
{
if (getIntention() != CtrlIntention.AI_INTENTION_ACTIVE)
if (getIntention() != AI_INTENTION_ACTIVE)
{
setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
setIntention(AI_INTENTION_ACTIVE);
}
break;
}
@@ -378,7 +378,7 @@ public class L2ControllableMobAI extends L2AttackableAI
if (hated != null)
{
_actor.setRunning();
setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated);
setIntention(AI_INTENTION_ATTACK, hated);
}
return;
}

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java
View File

@@ -353,7 +353,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
}
// Set the AI Intention to AI_INTENTION_ATTACK
setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated, null);
setIntention(AI_INTENTION_ATTACK, hated, null);
}
return;
@@ -559,7 +559,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
{
if (!npc.isDead() && (Math.abs(target.getZ() - npc.getZ()) < 600)
// && _actor.getAttackByList().contains(getAttackTarget())
&& ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE))
&& ((npc.getAI().getIntention() == AI_INTENTION_IDLE) || (npc.getAI().getIntention() == AI_INTENTION_ACTIVE))
// limiting aggro for siege guards
&& target.isInsideRadius(npc, 1500, true, false) && GeoData.getInstance().canSeeTarget(npc, target))
{
@@ -923,7 +923,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
// Set the Intention to AI_INTENTION_ATTACK
if (getIntention() != AI_INTENTION_ATTACK)
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker, null);
setIntention(AI_INTENTION_ATTACK, attacker, null);
}
super.onEvtAttacked(attacker);
@@ -969,7 +969,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
}
// Set the actor AI Intention to AI_INTENTION_ATTACK
if (getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
if (getIntention() != AI_INTENTION_ATTACK)
{
// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
if (!_actor.isRunning())
@@ -985,7 +985,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
// Check if the L2SiegeGuardInstance is not too far from its home location
if (((homeX * homeX) + (homeY * homeY)) < 3240000)
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, target, null);
setIntention(AI_INTENTION_ATTACK, target, null);
}
}
}

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java
View File

@@ -313,7 +313,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
}
// Set the AI Intention to AI_INTENTION_ATTACK
setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated, null);
setIntention(AI_INTENTION_ATTACK, hated, null);
}
return;
@@ -652,7 +652,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
}
// Check if the L2Object is inside the Faction Range of the actor
if ((npc.getAI() != null) && ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE)) && actor.isInsideRadius(npc, npc.getFactionRange(), false, true) && target.isInsideRadius(npc, npc.getFactionRange(), false, true))
if ((npc.getAI() != null) && ((npc.getAI().getIntention() == AI_INTENTION_IDLE) || (npc.getAI().getIntention() == AI_INTENTION_ACTIVE)) && actor.isInsideRadius(npc, npc.getFactionRange(), false, true) && target.isInsideRadius(npc, npc.getFactionRange(), false, true))
{
if (Config.PATHFINDING > 0)
{
@@ -749,7 +749,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
// Set the Intention to AI_INTENTION_ATTACK
if (getIntention() != AI_INTENTION_ATTACK)
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker, null);
setIntention(AI_INTENTION_ATTACK, attacker, null);
}
super.onEvtAttacked(attacker);
@@ -796,7 +796,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
}
// Set the actor AI Intention to AI_INTENTION_ATTACK
if (getIntention() != CtrlIntention.AI_INTENTION_ATTACK)
if (getIntention() != AI_INTENTION_ATTACK)
{
// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
if (!_actor.isRunning())
@@ -812,7 +812,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
// Check if the L2SiegeGuardInstance is not too far from its home location
if (((homeX * homeX) + (homeY * homeY)) < 3240000)
{
setIntention(CtrlIntention.AI_INTENTION_ATTACK, target, null);
setIntention(AI_INTENTION_ATTACK, target, null);
}
}
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java
View File

@@ -62,9 +62,9 @@ public class TopicBBSManager extends BaseBBSManager
}
f.vload();
Topic t = new Topic(Topic.ConstructorType.CREATE, TopicBBSManager.getInstance().getMaxID(f) + 1, Integer.parseInt(ar2), ar5, Calendar.getInstance().getTimeInMillis(), activeChar.getName(), activeChar.getObjectId(), Topic.MEMO, 0);
Topic t = new Topic(Topic.ConstructorType.CREATE, getInstance().getMaxID(f) + 1, Integer.parseInt(ar2), ar5, Calendar.getInstance().getTimeInMillis(), activeChar.getName(), activeChar.getObjectId(), Topic.MEMO, 0);
f.addTopic(t);
TopicBBSManager.getInstance().setMaxID(t.getID(), f);
getInstance().setMaxID(t.getID(), f);
Post p = new Post(activeChar.getName(), activeChar.getObjectId(), Calendar.getInstance().getTimeInMillis(), t.getID(), f.getID(), ar4);
PostBBSManager.getInstance().addPostByTopic(p, t);

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/SkillTable.java
View File

@@ -64,7 +64,7 @@ public class SkillTable
*/
public static int getSkillHashCode(L2Skill skill)
{
return SkillTable.getSkillHashCode(skill.getId(), skill.getLevel());
return getSkillHashCode(skill.getId(), skill.getLevel());
}
/**
@@ -80,7 +80,7 @@ public class SkillTable
public L2Skill getInfo(int skillId, int level)
{
return _skills.get(SkillTable.getSkillHashCode(skillId, level));
return _skills.get(getSkillHashCode(skillId, level));
}
public int getMaxLevel(int magicId, int level)
@@ -90,7 +90,7 @@ public class SkillTable
while (level < 100)
{
level++;
temp = _skills.get(SkillTable.getSkillHashCode(magicId, level));
temp = _skills.get(getSkillHashCode(magicId, level));
if (temp == null)
{

8
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/datatables/sql/ClanTable.java
View File

@@ -454,8 +454,8 @@ public class ClanTable
public void storeclanswars(int clanId1, int clanId2)
{
final L2Clan clan1 = ClanTable.getInstance().getClan(clanId1);
final L2Clan clan2 = ClanTable.getInstance().getClan(clanId2);
final L2Clan clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2);
clan1.setEnemyClan(clan2);
clan2.setAttackerClan(clan1);
@@ -495,8 +495,8 @@ public class ClanTable
public void deleteclanswars(int clanId1, int clanId2)
{
final L2Clan clan1 = ClanTable.getInstance().getClan(clanId1);
final L2Clan clan2 = ClanTable.getInstance().getClan(clanId2);
final L2Clan clan1 = getInstance().getClan(clanId1);
final L2Clan clan2 = getInstance().getClan(clanId2);
clan1.deleteEnemyClan(clan2);
clan2.deleteAttackerClan(clan1);

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java
View File

@@ -106,7 +106,7 @@ public class AutoAnnouncementHandler
replyMSG.append("</td></tr></table></center>");
replyMSG.append("<br>");
for (AutoAnnouncementInstance announcementInst : AutoAnnouncementHandler.getInstance().values())
for (AutoAnnouncementInstance announcementInst : getInstance().values())
{
replyMSG.append("<table width=260><tr><td width=220>[" + announcementInst.getDefaultDelay() + "s] " + announcementInst.getDefaultTexts() + "</td><td width=40>");
replyMSG.append("<button value=\"Delete\" action=\"bypass -h admin_del_autoannouncement " + announcementInst.getDefaultId() + "\" width=60 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");

3
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/SkillHandler.java
View File

@@ -55,7 +55,6 @@ import com.l2jmobius.gameserver.handler.skillhandlers.TakeCastle;
import com.l2jmobius.gameserver.handler.skillhandlers.Unlock;
import com.l2jmobius.gameserver.handler.skillhandlers.ZakenPlayer;
import com.l2jmobius.gameserver.handler.skillhandlers.ZakenSelf;
import com.l2jmobius.gameserver.model.L2Skill;
import com.l2jmobius.gameserver.model.L2Skill.SkillType;
/**
@@ -68,7 +67,7 @@ public class SkillHandler
private static SkillHandler _instance;
private final Map<L2Skill.SkillType, ISkillHandler> _datatable;
private final Map<SkillType, ISkillHandler> _datatable;
public static SkillHandler getInstance()
{

28
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/itemhandlers/Potions.java
View File

@@ -264,7 +264,7 @@ public class Potions implements IItemHandler
// MANA POTIONS
case 726: // mana drug, xml: 2003
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.MANA_HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.MANA_HEAL_OVER_TIME, itemId))
{
return;
}
@@ -284,7 +284,7 @@ public class Potions implements IItemHandler
}
case 725: // healing_drug, xml: 2002
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -293,7 +293,7 @@ public class Potions implements IItemHandler
}
case 727: // _healing_potion, xml: 2032
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -318,7 +318,7 @@ public class Potions implements IItemHandler
case 1060: // lesser_healing_potion,
case 1073: // beginner's potion, xml: 2031
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -327,7 +327,7 @@ public class Potions implements IItemHandler
}
case 1061: // healing_potion, xml: 2032
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -351,7 +351,7 @@ public class Potions implements IItemHandler
}
case 1539: // greater_healing_potion, xml: 2037
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -380,7 +380,7 @@ public class Potions implements IItemHandler
}
case 5283: // Rice Cake, xml: 2136
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -416,7 +416,7 @@ public class Potions implements IItemHandler
case 8627:
{
// elixir of Life
if (!isEffectReplaceable(activeChar, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(activeChar, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -441,7 +441,7 @@ public class Potions implements IItemHandler
case 8633:
{
// elixir of Strength
if (!isEffectReplaceable(activeChar, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(activeChar, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -466,7 +466,7 @@ public class Potions implements IItemHandler
case 8639:
{
// elixir of cp
if (!isEffectReplaceable(activeChar, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(activeChar, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -715,7 +715,7 @@ public class Potions implements IItemHandler
case 1060: // lesser_healing_potion,
case 1073: // beginner's potion, xml: 2031
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -724,7 +724,7 @@ public class Potions implements IItemHandler
}
case 1061: // healing_potion, xml: 2032
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -738,7 +738,7 @@ public class Potions implements IItemHandler
}
case 1539:
{
if (!isEffectReplaceable(playable, L2Effect.EffectType.HEAL_OVER_TIME, itemId))
if (!isEffectReplaceable(playable, EffectType.HEAL_OVER_TIME, itemId))
{
return;
}
@@ -902,7 +902,7 @@ public class Potions implements IItemHandler
return;
}
final List<Integer> possible_potions = Potions.get_potions_for_skill(skill_id, skill_level);
final List<Integer> possible_potions = get_potions_for_skill(skill_id, skill_level);
if (!possible_potions.isEmpty())
{

46
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
View File

@@ -48,24 +48,24 @@ public class Continuous implements ISkillHandler
{
private static final SkillType[] SKILL_IDS =
{
L2Skill.SkillType.BUFF,
L2Skill.SkillType.DEBUFF,
L2Skill.SkillType.DOT,
L2Skill.SkillType.MDOT,
L2Skill.SkillType.POISON,
L2Skill.SkillType.BLEED,
L2Skill.SkillType.HOT,
L2Skill.SkillType.CPHOT,
L2Skill.SkillType.MPHOT,
SkillType.BUFF,
SkillType.DEBUFF,
SkillType.DOT,
SkillType.MDOT,
SkillType.POISON,
SkillType.BLEED,
SkillType.HOT,
SkillType.CPHOT,
SkillType.MPHOT,
// L2Skill.SkillType.MANAHEAL,
// L2Skill.SkillType.MANA_BY_LEVEL,
L2Skill.SkillType.FEAR,
L2Skill.SkillType.CONT,
L2Skill.SkillType.WEAKNESS,
L2Skill.SkillType.REFLECT,
L2Skill.SkillType.UNDEAD_DEFENSE,
L2Skill.SkillType.AGGDEBUFF,
L2Skill.SkillType.FORCE_BUFF
SkillType.FEAR,
SkillType.CONT,
SkillType.WEAKNESS,
SkillType.REFLECT,
SkillType.UNDEAD_DEFENSE,
SkillType.AGGDEBUFF,
SkillType.FORCE_BUFF
};
private L2Skill _skill;
@@ -135,7 +135,7 @@ public class Continuous implements ISkillHandler
}
}
if ((skill.getSkillType() != L2Skill.SkillType.BUFF) && (skill.getSkillType() != L2Skill.SkillType.HOT) && (skill.getSkillType() != L2Skill.SkillType.CPHOT) && (skill.getSkillType() != L2Skill.SkillType.MPHOT) && (skill.getSkillType() != L2Skill.SkillType.UNDEAD_DEFENSE) && (skill.getSkillType() != L2Skill.SkillType.AGGDEBUFF) && (skill.getSkillType() != L2Skill.SkillType.CONT))
if ((skill.getSkillType() != SkillType.BUFF) && (skill.getSkillType() != SkillType.HOT) && (skill.getSkillType() != SkillType.CPHOT) && (skill.getSkillType() != SkillType.MPHOT) && (skill.getSkillType() != SkillType.UNDEAD_DEFENSE) && (skill.getSkillType() != SkillType.AGGDEBUFF) && (skill.getSkillType() != SkillType.CONT))
{
if (target.reflectSkill(skill))
{
@@ -144,19 +144,19 @@ public class Continuous implements ISkillHandler
}
// Walls and Door should not be buffed
if ((target instanceof L2DoorInstance) && ((skill.getSkillType() == L2Skill.SkillType.BUFF) || (skill.getSkillType() == L2Skill.SkillType.HOT)))
if ((target instanceof L2DoorInstance) && ((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HOT)))
{
continue;
}
// Anti-Buff Protection prevents you from getting buffs by other players
if ((activeChar instanceof L2Playable) && (target != activeChar) && target.isBuffProtected() && !skill.isHeroSkill() && ((skill.getSkillType() == L2Skill.SkillType.BUFF) || (skill.getSkillType() == L2Skill.SkillType.HEAL_PERCENT) || (skill.getSkillType() == L2Skill.SkillType.FORCE_BUFF) || (skill.getSkillType() == L2Skill.SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == L2Skill.SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == L2Skill.SkillType.REFLECT)))
if ((activeChar instanceof L2Playable) && (target != activeChar) && target.isBuffProtected() && !skill.isHeroSkill() && ((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL_PERCENT) || (skill.getSkillType() == SkillType.FORCE_BUFF) || (skill.getSkillType() == SkillType.MANAHEAL_PERCENT) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.REFLECT)))
{
continue;
}
// Player holding a cursed weapon can't be buffed and can't buff
if (skill.getSkillType() == L2Skill.SkillType.BUFF)
if (skill.getSkillType() == SkillType.BUFF)
{
if (target != activeChar)
{
@@ -208,7 +208,7 @@ public class Continuous implements ISkillHandler
continue;
}
}
else if (skill.getSkillType() == L2Skill.SkillType.BUFF)
else if (skill.getSkillType() == SkillType.BUFF)
{
if (!Formulas.getInstance().calcBuffSuccess(target, skill))
{
@@ -258,7 +258,7 @@ public class Continuous implements ISkillHandler
// if this is a debuff let the duel manager know about it
// so the debuff can be removed after the duel
// (player & target must be in the same duel)
if ((target instanceof L2PcInstance) && (player != null) && ((L2PcInstance) target).isInDuel() && ((skill.getSkillType() == L2Skill.SkillType.DEBUFF) || (skill.getSkillType() == L2Skill.SkillType.BUFF)) && (player.getDuelId() == ((L2PcInstance) target).getDuelId()))
if ((target instanceof L2PcInstance) && (player != null) && ((L2PcInstance) target).isInDuel() && ((skill.getSkillType() == SkillType.DEBUFF) || (skill.getSkillType() == SkillType.BUFF)) && (player.getDuelId() == ((L2PcInstance) target).getDuelId()))
{
DuelManager dm = DuelManager.getInstance();
if (dm != null)
@@ -281,7 +281,7 @@ public class Continuous implements ISkillHandler
skill.getEffects(activeChar, target, ss, sps, bss);
}
if (skill.getSkillType() == L2Skill.SkillType.AGGDEBUFF)
if (skill.getSkillType() == SkillType.AGGDEBUFF)
{
if (target instanceof L2Attackable)
{

40
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/skillhandlers/Disablers.java
View File

@@ -51,26 +51,26 @@ public class Disablers implements ISkillHandler
{
private static final SkillType[] SKILL_IDS =
{
L2Skill.SkillType.STUN,
L2Skill.SkillType.ROOT,
L2Skill.SkillType.SLEEP,
L2Skill.SkillType.CONFUSION,
L2Skill.SkillType.AGGDAMAGE,
L2Skill.SkillType.AGGREDUCE,
L2Skill.SkillType.AGGREDUCE_CHAR,
L2Skill.SkillType.AGGREMOVE,
L2Skill.SkillType.UNBLEED,
L2Skill.SkillType.UNPOISON,
L2Skill.SkillType.MUTE,
L2Skill.SkillType.FAKE_DEATH,
L2Skill.SkillType.CONFUSE_MOB_ONLY,
L2Skill.SkillType.NEGATE,
L2Skill.SkillType.CANCEL,
L2Skill.SkillType.PARALYZE,
L2Skill.SkillType.ERASE,
L2Skill.SkillType.MAGE_BANE,
L2Skill.SkillType.WARRIOR_BANE,
L2Skill.SkillType.BETRAY
SkillType.STUN,
SkillType.ROOT,
SkillType.SLEEP,
SkillType.CONFUSION,
SkillType.AGGDAMAGE,
SkillType.AGGREDUCE,
SkillType.AGGREDUCE_CHAR,
SkillType.AGGREMOVE,
SkillType.UNBLEED,
SkillType.UNPOISON,
SkillType.MUTE,
SkillType.FAKE_DEATH,
SkillType.CONFUSE_MOB_ONLY,
SkillType.NEGATE,
SkillType.CANCEL,
SkillType.PARALYZE,
SkillType.ERASE,
SkillType.MAGE_BANE,
SkillType.WARRIOR_BANE,
SkillType.BETRAY
};
protected static final Logger LOGGER = Logger.getLogger(L2Skill.class.getName());

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/CompactionIDFactory.java
View File

@@ -61,7 +61,7 @@ public class CompactionIDFactory extends IdFactory
}
}
private int insertUntil(int[] tmp_obj_ids, int idx, int N, java.sql.Connection con) throws SQLException
private int insertUntil(int[] tmp_obj_ids, int idx, int N, Connection con) throws SQLException
{
int id = tmp_obj_ids[idx];
if (id == _curOID)

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/idfactory/StackIDFactory.java
View File

@@ -71,7 +71,7 @@ public class StackIDFactory extends IdFactory
}
}
private int insertUntil(int[] tmp_obj_ids, int idx, int N, java.sql.Connection con) throws SQLException
private int insertUntil(int[] tmp_obj_ids, int idx, int N, Connection con) throws SQLException
{
final int id = tmp_obj_ids[idx];
if (id == _tempOID)

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java
View File

@@ -403,7 +403,7 @@ public class CursedWeaponsManager
sm = new SystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name
sm.addItemName(cw.getItemId());
CursedWeaponsManager.announce(sm);
announce(sm);
}
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java
View File

@@ -88,7 +88,7 @@ public class QuestManager extends ScriptManager<Quest>
// now load all scripts
final File scripts = new File(Config.DATAPACK_ROOT + "/data/scripts.cfg");
L2ScriptEngineManager.getInstance().executeScriptsList(scripts);
QuestManager.getInstance().report();
getInstance().report();
}
public final void report()
@@ -192,6 +192,6 @@ public class QuestManager extends ScriptManager<Quest>
quest.unload();
}
}
QuestManager.getInstance().report();
getInstance().report();
}
}

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java
View File

@@ -40,7 +40,7 @@ public class RaidBossPointsManager
private static final Logger LOGGER = Logger.getLogger(RaidBossPointsManager.class.getName());
protected static Map<Integer, Map<Integer, Integer>> _list;
private static final Comparator<Map.Entry<Integer, Integer>> _comparator = (entry, entry1) -> entry.getValue().equals(entry1.getValue()) ? 0 : entry.getValue() < entry1.getValue() ? 1 : -1;
private static final Comparator<Entry<Integer, Integer>> _comparator = (entry, entry1) -> entry.getValue().equals(entry1.getValue()) ? 0 : entry.getValue() < entry1.getValue() ? 1 : -1;
public static final void init()
{
@@ -188,7 +188,7 @@ public class RaidBossPointsManager
Collections.sort(list, _comparator);
int ranking = 1;
for (Map.Entry<Integer, Integer> entry : list)
for (Entry<Integer, Integer> entry : list)
{
tmpRanking.put(entry.getKey(), ranking++);
}
@@ -219,7 +219,7 @@ public class RaidBossPointsManager
Collections.sort(list, _comparator);
int ranking = 1;
for (Map.Entry<Integer, Integer> entry : list)
for (Entry<Integer, Integer> entry : list)
{
tmpRanking.put(entry.getKey(), ranking++);
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/BlockList.java
View File

@@ -264,7 +264,7 @@ public class BlockList
if (player != null)
{
return BlockList.isBlocked(player, targetId);
return isBlocked(player, targetId);
}
if (!_offlineList.containsKey(ownerId))

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/Inventory.java
View File

@@ -1114,7 +1114,7 @@ public abstract class Inventory extends ItemContainer
// public synchronized L2ItemInstance[] unEquipItemInBodySlotAndRecord(int slot)
public L2ItemInstance[] unEquipItemInBodySlotAndRecord(int slot)
{
final Inventory.ChangeRecorder recorder = newRecorder();
final ChangeRecorder recorder = newRecorder();
try
{
@@ -1154,7 +1154,7 @@ public abstract class Inventory extends ItemContainer
// public synchronized L2ItemInstance[] unEquipItemInSlotAndRecord(int slot)
public L2ItemInstance[] unEquipItemInSlotAndRecord(int slot)
{
final Inventory.ChangeRecorder recorder = newRecorder();
final ChangeRecorder recorder = newRecorder();
try
{
@@ -1302,7 +1302,7 @@ public abstract class Inventory extends ItemContainer
*/
public L2ItemInstance[] equipItemAndRecord(L2ItemInstance item)
{
final Inventory.ChangeRecorder recorder = newRecorder();
final ChangeRecorder recorder = newRecorder();
try
{

14
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@@ -256,7 +256,7 @@ public class L2Clan
final L2PcInstance exLeader = old_leader.getPlayerInstance();
exLeader.setClan(this);
exLeader.setPledgeClass(exLeader.getClan().getClanMember(exLeader.getObjectId()).calculatePledgeClass(exLeader));
exLeader.setClanPrivileges(L2Clan.CP_NOTHING);
exLeader.setClanPrivileges(CP_NOTHING);
exLeader.broadcastUserInfo();
@@ -270,7 +270,7 @@ public class L2Clan
final L2PcInstance newLeader = member.getPlayerInstance();
newLeader.setClan(this);
newLeader.setPledgeClass(member.calculatePledgeClass(newLeader));
newLeader.setClanPrivileges(L2Clan.CP_ALL);
newLeader.setClanPrivileges(CP_ALL);
newLeader.broadcastUserInfo();
}
@@ -1602,7 +1602,7 @@ public class L2Clan
if (pledgeType == 0)
{
if (pledgeType == L2Clan.SUBUNIT_ACADEMY)
if (pledgeType == SUBUNIT_ACADEMY)
{
player.sendPacket(SystemMessageId.CLAN_HAS_ALREADY_ESTABLISHED_A_CLAN_ACADEMY);
}
@@ -1621,7 +1621,7 @@ public class L2Clan
// Royal Guard 5000 points per each
// Order of Knights 10000 points per each
if ((pledgeType != -1) && (((getReputationScore() < 5000) && (pledgeType < L2Clan.SUBUNIT_KNIGHT1)) || ((getReputationScore() < 10000) && (pledgeType > L2Clan.SUBUNIT_ROYAL2))))
if ((pledgeType != -1) && (((getReputationScore() < 5000) && (pledgeType < SUBUNIT_KNIGHT1)) || ((getReputationScore() < 10000) && (pledgeType > SUBUNIT_ROYAL2))))
{
SystemMessage sp = new SystemMessage(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW);
player.sendPacket(sp);
@@ -1995,7 +1995,7 @@ public class L2Clan
return false;
}
if ((activeChar.getClanPrivileges() & L2Clan.CP_CL_JOIN_CLAN) != L2Clan.CP_CL_JOIN_CLAN)
if ((activeChar.getClanPrivileges() & CP_CL_JOIN_CLAN) != CP_CL_JOIN_CLAN)
{
activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
return false;
@@ -2252,7 +2252,7 @@ public class L2Clan
if (getAllyPenaltyExpiryTime() > System.currentTimeMillis())
{
if (getAllyPenaltyType() == L2Clan.PENALTY_TYPE_DISSOLVE_ALLY)
if (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY)
{
player.sendPacket(SystemMessageId.CANT_CREATE_ALLIANCE_10_DAYS_DISOLUTION);
return;
@@ -2345,7 +2345,7 @@ public class L2Clan
setAllyId(0);
setAllyName(null);
// 24*60*60*1000 = 86400000
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000L), L2Clan.PENALTY_TYPE_DISSOLVE_ALLY);
setAllyPenaltyExpiryTime(currentTime + (Config.ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED * 86400000L), PENALTY_TYPE_DISSOLVE_ALLY);
updateClanInDB();
// The clan leader should take the XP penalty of a full death.

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/PcInventory.java
View File

@@ -261,15 +261,15 @@ public class PcInventory extends Inventory
* @param tradeList
* @return L2ItemInstance : items in inventory
*/
public TradeList.TradeItem[] getAvailableItems(TradeList tradeList)
public TradeItem[] getAvailableItems(TradeList tradeList)
{
final List<TradeList.TradeItem> list = new ArrayList<>();
final List<TradeItem> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isAvailable(getOwner(), false, false))
{
final TradeList.TradeItem adjItem = tradeList.adjustAvailableItem(item);
final TradeItem adjItem = tradeList.adjustAvailableItem(item);
if (adjItem != null)
{
list.add(adjItem);
@@ -277,7 +277,7 @@ public class PcInventory extends Inventory
}
}
return list.toArray(new TradeList.TradeItem[list.size()]);
return list.toArray(new TradeItem[list.size()]);
}
/**
@@ -286,7 +286,7 @@ public class PcInventory extends Inventory
* @param list
* @return
*/
public TradeItem adjustAvailableItem(TradeItem item, List<TradeList.TradeItem> list)
public TradeItem adjustAvailableItem(TradeItem item, List<TradeItem> list)
{
for (L2ItemInstance adjItem : _items)
{
@@ -313,7 +313,7 @@ public class PcInventory extends Inventory
else if ((adjItem.getItemId() == item.getItem().getItemId()) && (adjItem.getEnchantLevel() == item.getEnchant()))
{
boolean found = false;
for (TradeList.TradeItem actual : list)
for (TradeItem actual : list)
{
if (actual.getObjectId() == adjItem.getObjectId())

8
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/TradeList.java
View File

@@ -219,17 +219,17 @@ public class TradeList
* @param inventory
* @return L2ItemInstance : items in inventory
*/
public TradeList.TradeItem[] getAvailableItems(PcInventory inventory)
public TradeItem[] getAvailableItems(PcInventory inventory)
{
final List<TradeList.TradeItem> list = new ArrayList<>();
final List<TradeItem> list = new ArrayList<>();
for (TradeList.TradeItem item : _items)
for (TradeItem item : _items)
{
item = new TradeItem(item, item.getCount(), item.getPrice());
list.add(inventory.adjustAvailableItem(item, list));
}
return list.toArray(new TradeList.TradeItem[list.size()]);
return list.toArray(new TradeItem[list.size()]);
}
/**

28
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -1829,7 +1829,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
return;
}
else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF) || (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_PET) || (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_PARTY) || (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_CLAN) || (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_ALLY)) && !skill.isPotion())
else if (((skill.getSkillType() == SkillType.BUFF) || (skill.getSkillType() == SkillType.HEAL) || (skill.getSkillType() == SkillType.COMBATPOINTHEAL) || (skill.getSkillType() == SkillType.COMBATPOINTPERCENTHEAL) || (skill.getSkillType() == SkillType.MANAHEAL) || (skill.getSkillType() == SkillType.REFLECT) || (skill.getSkillType() == SkillType.SEED) || (skill.getTargetType() == SkillTargetType.TARGET_SELF) || (skill.getTargetType() == SkillTargetType.TARGET_PET) || (skill.getTargetType() == SkillTargetType.TARGET_PARTY) || (skill.getTargetType() == SkillTargetType.TARGET_CLAN) || (skill.getTargetType() == SkillTargetType.TARGET_ALLY)) && !skill.isPotion())
{
target = (L2Character) targets[0];
@@ -3720,7 +3720,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
final L2Skill tempskill = newEffect.getSkill();
// Remove first Buff if number of buffs > BUFFS_MAX_AMOUNT
if ((getBuffCount() >= getMaxBuffCount()) && !doesStack(tempskill) && ((tempskill.getSkillType() == L2Skill.SkillType.BUFF) || (tempskill.getSkillType() == L2Skill.SkillType.REFLECT) || (tempskill.getSkillType() == L2Skill.SkillType.HEAL_PERCENT) || (tempskill.getSkillType() == L2Skill.SkillType.MANAHEAL_PERCENT)) && ((tempskill.getId() <= 4360) || (tempskill.getId() >= 4367)) && ((tempskill.getId() <= 4550) || (tempskill.getId() >= 4555)))
if ((getBuffCount() >= getMaxBuffCount()) && !doesStack(tempskill) && ((tempskill.getSkillType() == SkillType.BUFF) || (tempskill.getSkillType() == SkillType.REFLECT) || (tempskill.getSkillType() == SkillType.HEAL_PERCENT) || (tempskill.getSkillType() == SkillType.MANAHEAL_PERCENT)) && ((tempskill.getId() <= 4360) || (tempskill.getId() >= 4367)) && ((tempskill.getId() <= 4550) || (tempskill.getId() >= 4555)))
{
if (newEffect.isHerbEffect())
{
@@ -7508,7 +7508,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
return;
}
// Notify AI with AI_INTENTION_ATTACK
player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
player.getAI().setIntention(AI_INTENTION_ATTACK, this);
}
/**
@@ -8120,7 +8120,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
continue;
}
if (((e.getSkill().getSkillType() == L2Skill.SkillType.BUFF) || (e.getSkill().getId() == 1416) || (e.getSkill().getSkillType() == L2Skill.SkillType.REFLECT) || (e.getSkill().getSkillType() == L2Skill.SkillType.HEAL_PERCENT) || (e.getSkill().getSkillType() == L2Skill.SkillType.MANAHEAL_PERCENT)) && ((e.getSkill().getId() <= 4360) || (e.getSkill().getId() >= 4367))) // 7s
if (((e.getSkill().getSkillType() == SkillType.BUFF) || (e.getSkill().getId() == 1416) || (e.getSkill().getSkillType() == SkillType.REFLECT) || (e.getSkill().getSkillType() == SkillType.HEAL_PERCENT) || (e.getSkill().getSkillType() == SkillType.MANAHEAL_PERCENT)) && ((e.getSkill().getId() <= 4360) || (e.getSkill().getId() >= 4367))) // 7s
// buffs
{
numBuffs++;
@@ -8192,7 +8192,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
continue;
}
if (((e.getSkill().getSkillType() == L2Skill.SkillType.BUFF) || (e.getSkill().getSkillType() == L2Skill.SkillType.REFLECT) || (e.getSkill().getSkillType() == L2Skill.SkillType.HEAL_PERCENT) || (e.getSkill().getSkillType() == L2Skill.SkillType.MANAHEAL_PERCENT)) && ((e.getSkill().getId() <= 4360) || (e.getSkill().getId() >= 4367)))
if (((e.getSkill().getSkillType() == SkillType.BUFF) || (e.getSkill().getSkillType() == SkillType.REFLECT) || (e.getSkill().getSkillType() == SkillType.HEAL_PERCENT) || (e.getSkill().getSkillType() == SkillType.MANAHEAL_PERCENT)) && ((e.getSkill().getId() <= 4360) || (e.getSkill().getId() >= 4367)))
{
if (preferSkill == 0)
{
@@ -8410,7 +8410,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
continue;
}
}
else if (L2Character.isInsidePeaceZone(this, targets[i]))
else if (isInsidePeaceZone(this, targets[i]))
{
continue;
}
@@ -8714,16 +8714,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
// If CTRL is pressed the autoattack is aborted (like L2OFF)
if ((skilldat != null) && !skilldat.isCtrlPressed() && skill.nextActionIsAttack() && (getTarget() != null) && (getTarget() instanceof L2Character))
{
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getTarget());
getAI().setIntention(AI_INTENTION_ATTACK, getTarget());
}
}
else if (skill.nextActionIsAttack() && (getTarget() != null) && (getTarget() instanceof L2Character))
{
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getTarget());
getAI().setIntention(AI_INTENTION_ATTACK, getTarget());
}
else if ((skill.isOffensive()) && (skill.getSkillType() != SkillType.UNLOCK) && (skill.getSkillType() != SkillType.BLOW) && (skill.getSkillType() != SkillType.DELUXE_KEY_UNLOCK) && (skill.getId() != 345) && (skill.getId() != 346))
{
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getTarget());
getAI().setIntention(AI_INTENTION_ATTACK, getTarget());
getAI().clientStartAutoAttack();
}
}
@@ -8735,7 +8735,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
{
if (!skill.isMagic() && skill.nextActionIsAttack())
{
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getTarget());
getAI().setIntention(AI_INTENTION_ATTACK, getTarget());
}
getAI().clientStartAutoAttack();
@@ -8745,7 +8745,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
{
if (!skill.isMagic())
{
getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, getTarget());
getAI().setIntention(AI_INTENTION_ATTACK, getTarget());
}
getAI().clientStartAutoAttack();
@@ -9053,7 +9053,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
// Set some values inside target's instance for later use
L2Character player = (L2Character) target;
if (skill.getEffectType() == L2Skill.SkillType.BUFF)
if (skill.getEffectType() == SkillType.BUFF)
{
if (player.isBlockBuff())
{
@@ -9269,7 +9269,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
if ((player instanceof L2PcInstance) || (player instanceof L2Summon))
{
// Signets are a special case, casted on target_self but don't harm self
if ((skill.getSkillType() != L2Skill.SkillType.SIGNET) && (skill.getSkillType() != L2Skill.SkillType.SIGNET_CASTTIME))
if ((skill.getSkillType() != SkillType.SIGNET) && (skill.getSkillType() != SkillType.SIGNET_CASTTIME))
{
player.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, activeChar);
activeChar.updatePvPStatus(player);
@@ -9311,7 +9311,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
activeChar.updatePvPStatus();
}
}
else if ((player instanceof L2Attackable) && (skill.getSkillType() != L2Skill.SkillType.SUMMON) && (skill.getSkillType() != L2Skill.SkillType.BEAST_FEED) && (skill.getSkillType() != L2Skill.SkillType.UNLOCK) && (skill.getSkillType() != L2Skill.SkillType.DELUXE_KEY_UNLOCK))
else if ((player instanceof L2Attackable) && (skill.getSkillType() != SkillType.SUMMON) && (skill.getSkillType() != SkillType.BEAST_FEED) && (skill.getSkillType() != SkillType.UNLOCK) && (skill.getSkillType() != SkillType.DELUXE_KEY_UNLOCK))
{
activeChar.updatePvPStatus(this);
}

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@@ -104,7 +104,7 @@ public abstract class L2Summon extends L2Playable
_showSummonAnimation = true;
_owner = owner;
_ai = new L2SummonAI(new L2Summon.AIAccessor());
_ai = new L2SummonAI(new AIAccessor());
// Make sure summon does not spawn in a wall.
final int x = owner.getX();
@@ -156,7 +156,7 @@ public abstract class L2Summon extends L2Playable
{
if (_ai == null)
{
_ai = new L2SummonAI(new L2Summon.AIAccessor());
_ai = new L2SummonAI(new AIAccessor());
}
}
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java
View File

@@ -64,7 +64,7 @@ public final class L2ItemInstance extends L2Object
private static final Logger LOGGER = Logger.getLogger(L2ItemInstance.class.getName());
/** The Constant _logItems. */
private static final java.util.logging.Logger _logItems = java.util.logging.Logger.getLogger("item");
private static final Logger _logItems = Logger.getLogger("item");
/** The _drop protection. */
private final DropProtection _dropProtection = new DropProtection();

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -1736,7 +1736,7 @@ public final class L2PcInstance extends L2Playable
_appearance = app;
// Create an AI
_ai = new L2PlayerAI(new L2PcInstance.AIAccessor());
_ai = new L2PlayerAI(new AIAccessor());
// Create a L2Radar object
_radar = new L2Radar(this);
@@ -1873,7 +1873,7 @@ public final class L2PcInstance extends L2Playable
{
if (_ai == null)
{
_ai = new L2PlayerAI(new L2PcInstance.AIAccessor());
_ai = new L2PlayerAI(new AIAccessor());
}
}
}
@@ -12187,7 +12187,7 @@ public final class L2PcInstance extends L2Playable
if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsume()))
{
// Checked: when a summon skill failed, server show required consume item count
if (sklType == L2Skill.SkillType.SUMMON)
if (sklType == SkillType.SUMMON)
{
final SystemMessage sm = new SystemMessage(SystemMessageId.SUMMONING_SERVITOR_COSTS_S2_S1);
sm.addItemName(skill.getItemConsumeId());
@@ -12214,7 +12214,7 @@ public final class L2PcInstance extends L2Playable
}
// Like L2OFF if you have a summon you can't summon another one (ignore cubics)
if ((sklType == L2Skill.SkillType.SUMMON) && (skill instanceof L2SkillSummon) && !((L2SkillSummon) skill).isCubic())
if ((sklType == SkillType.SUMMON) && (skill instanceof L2SkillSummon) && !((L2SkillSummon) skill).isCubic())
{
if ((getPet() != null) || isMounted())
{
@@ -12262,7 +12262,7 @@ public final class L2PcInstance extends L2Playable
// Abnormal effects(ex : Stun, Sleep...) are checked in L2Character useMagic()
// Check if the player use "Fake Death" skill
if (isAlikeDead() && !skill.isPotion() && (skill.getSkillType() != L2Skill.SkillType.FAKE_DEATH))
if (isAlikeDead() && !skill.isPotion() && (skill.getSkillType() != SkillType.FAKE_DEATH))
{
// Send a Server->Client packet ActionFailed to the L2PcInstance

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/Announcements.java
View File

@@ -280,7 +280,7 @@ public class Announcements
{
// Announce string to everyone on server
String text = command.substring(lengthToTrim);
Announcements.getInstance().announceToAll(text);
getInstance().announceToAll(text);
}
// No body cares!
catch (StringIndexOutOfBoundsException e)

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/CTF.java
View File

@@ -1578,7 +1578,7 @@ public class CTF implements EventTask
}
}
if (CTF._savePlayers.contains(eventPlayer.getName()))
if (_savePlayers.contains(eventPlayer.getName()))
{
eventPlayer.sendMessage("You already participated in another event!");
return false;
@@ -2276,7 +2276,7 @@ public class CTF implements EventTask
}
else
{
player.getInventory().destroyItemByItemId("", CTF._FLAG_IN_HAND_ITEM_ID, 1, player, null);
player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
}
player._haveFlagCTF = false;
}
@@ -3038,7 +3038,7 @@ public class CTF implements EventTask
}
}
// Add the flag in his hands
_player.getInventory().equipItem(ItemTable.getInstance().createItem("", CTF._FLAG_IN_HAND_ITEM_ID, 1, _player, null));
_player.getInventory().equipItem(ItemTable.getInstance().createItem("", _FLAG_IN_HAND_ITEM_ID, 1, _player, null));
_player.broadcastPacket(new SocialAction(_player.getObjectId(), 16)); // Amazing glow
_player._haveFlagCTF = true;
_player.broadcastUserInfo();
@@ -3057,7 +3057,7 @@ public class CTF implements EventTask
if (wpn != null)
{
final L2ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
player.getInventory().destroyItemByItemId("", CTF._FLAG_IN_HAND_ITEM_ID, 1, player, null);
player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
final InventoryUpdate iu = new InventoryUpdate();
for (L2ItemInstance element : unequiped)
{
@@ -3070,7 +3070,7 @@ public class CTF implements EventTask
}
else
{
player.getInventory().destroyItemByItemId("", CTF._FLAG_IN_HAND_ITEM_ID, 1, player, null);
player.getInventory().destroyItemByItemId("", _FLAG_IN_HAND_ITEM_ID, 1, player, null);
player.sendPacket(new ItemList(player, true)); // Get your weapon back now ...
player.abortAttack();
player.broadcastUserInfo();
@@ -3250,7 +3250,7 @@ public class CTF implements EventTask
*/
public static boolean InRangeOfFlag(L2PcInstance _player, int flagIndex, int offset)
{
if ((_player.getX() > (CTF._flagsX.get(flagIndex) - offset)) && (_player.getX() < (CTF._flagsX.get(flagIndex) + offset)) && (_player.getY() > (CTF._flagsY.get(flagIndex) - offset)) && (_player.getY() < (CTF._flagsY.get(flagIndex) + offset)) && (_player.getZ() > (CTF._flagsZ.get(flagIndex) - offset)) && (_player.getZ() < (CTF._flagsZ.get(flagIndex) + offset)))
if ((_player.getX() > (_flagsX.get(flagIndex) - offset)) && (_player.getX() < (_flagsX.get(flagIndex) + offset)) && (_player.getY() > (_flagsY.get(flagIndex) - offset)) && (_player.getY() < (_flagsY.get(flagIndex) + offset)) && (_player.getZ() > (_flagsZ.get(flagIndex) - offset)) && (_player.getZ() < (_flagsZ.get(flagIndex) + offset)))
{
return true;
}

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/L2Event.java
View File

@@ -169,7 +169,7 @@ public class L2Event
replyMSG.append("<br>" + inbr.readLine());
if (L2Event.participatingPlayers.contains(player.getName()))
if (participatingPlayers.contains(player.getName()))
{
replyMSG.append("<br><center>You are already in the event players list !!</center></body></html>");
}
@@ -271,7 +271,7 @@ public class L2Event
spawn.init();
spawn.getLastSpawn().getStatus().setCurrentHp(999999999);
spawn.getLastSpawn().setName("event inscriptor");
spawn.getLastSpawn().setTitle(L2Event.eventName);
spawn.getLastSpawn().setTitle(eventName);
spawn.getLastSpawn().isEventMob = true;
spawn.getLastSpawn().isAggressive();
spawn.getLastSpawn().decayMe();
@@ -299,9 +299,9 @@ public class L2Event
public static boolean isOnEvent(L2PcInstance player)
{
for (int k = 0; k < L2Event.teamsNumber; k++)
for (int k = 0; k < teamsNumber; k++)
{
Iterator<String> it = L2Event.players.get(k + 1).iterator();
Iterator<String> it = players.get(k + 1).iterator();
boolean temp = false;
@@ -322,7 +322,7 @@ public class L2Event
{
try
{
L2Event.participatingPlayers.add(player.getName());
participatingPlayers.add(player.getName());
player.eventKarma = player.getKarma();
player.eventX = player.getX();
player.eventY = player.getY();

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/event/VIP.java
View File

@@ -690,7 +690,7 @@ public class VIP
public static void teleportPlayers()
{
VIP.sit();
sit();
for (L2PcInstance player : _playersVIP)
{

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/olympiad/Olympiad.java
View File

@@ -524,7 +524,7 @@ public class Olympiad
{
final L2PcInstance player = L2World.getInstance().getPlayer(character_name);
if ((player != null) && ((player.getOlympiadGameId() > 0) || player.isInOlympiadMode() || Olympiad.getInstance().isRegistered(player)))
if ((player != null) && ((player.getOlympiadGameId() > 0) || player.isInOlympiadMode() || getInstance().isRegistered(player)))
{
noble.sendMessage("You are already participating in Olympiad with another char!");
return false;
@@ -632,7 +632,7 @@ public class Olympiad
{
_oldnobles.remove(playerId);
_oldnobles.put(playerId, stats);
Olympiad.getInstance().saveOldNobleData(playerId);
getInstance().saveOldNobleData(playerId);
}
protected static List<L2PcInstance> getRegisteredNonClassBased()
@@ -666,7 +666,7 @@ public class Olympiad
protected static boolean hasEnoughRegisteredNonClassed()
{
return Olympiad.getRegisteredNonClassBased().size() >= Config.ALT_OLY_NONCLASSED;
return getRegisteredNonClassBased().size() >= Config.ALT_OLY_NONCLASSED;
}
protected static void clearRegistered()
@@ -1654,7 +1654,7 @@ public class Olympiad
replyMSG.append("<tr><td fixwidth=30>NO.</td><td fixwidth=60>Status</td><td>Player1 / Player2</td></tr>");
final Map<Integer, String> matches = getInstance().getMatchList();
for (int i = 0; i < Olympiad.getStadiumCount(); i++)
for (int i = 0; i < getStadiumCount(); i++)
{
final int arenaID = i + 1;
String players = "&nbsp;";
@@ -1679,9 +1679,9 @@ public class Olympiad
final int arena = getSpectatorArena(player);
if (arena >= 0)
{
Olympiad.removeSpectator(arena, player);
removeSpectator(arena, player);
}
Olympiad.addSpectator(id, player, false);
addSpectator(id, player, false);
}
protected void setNewOlympiadEndCustom()

8
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/sevensigns/SevenSignsFestival.java
View File

@@ -3326,22 +3326,22 @@ public class SevenSignsFestival implements SpawnListener
switch (festivalId)
{
case SevenSignsFestival.FESTIVAL_LEVEL_MAX_FOR_31:
case FESTIVAL_LEVEL_MAX_FOR_31:
{
maxLevel = 31;
break;
}
case SevenSignsFestival.FESTIVAL_LEVEL_MAX_FOR_42:
case FESTIVAL_LEVEL_MAX_FOR_42:
{
maxLevel = 42;
break;
}
case SevenSignsFestival.FESTIVAL_LEVEL_MAX_FOR_53:
case FESTIVAL_LEVEL_MAX_FOR_53:
{
maxLevel = 53;
break;
}
case SevenSignsFestival.FESTIVAL_LEVEL_MAX_FOR_64:
case FESTIVAL_LEVEL_MAX_FOR_64:
{
maxLevel = 64;
break;

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/FortSiege.java
View File

@@ -323,13 +323,13 @@ public class FortSiege
unSpawnFlags();
// Teleport to the second closest town
teleportPlayer(FortSiege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
// Teleport to the second closest town
teleportPlayer(FortSiege.TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
// Teleport to the second closest town
teleportPlayer(FortSiege.TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
// Flag so that siege instance can be started
_isInProgress = false;
@@ -479,7 +479,7 @@ public class FortSiege
updatePlayerSiegeStateFlags(false);
// Teleport to the closest town
teleportPlayer(FortSiege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
// Spawn commander
spawnCommander(getFort().getFortId());
@@ -1089,7 +1089,7 @@ public class FortSiege
_siegeRegistrationEndDate.add(Calendar.MINUTE, -10);
// Schedule siege auto start
ThreadPool.schedule(new FortSiege.ScheduleStartSiegeTask(getFort()), 1000);
ThreadPool.schedule(new ScheduleStartSiegeTask(getFort()), 1000);
}
/**

14
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/Siege.java
View File

@@ -386,13 +386,13 @@ public class Siege
removeFlags();
// Teleport to the second closest town
teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
// Teleport to the second closest town
teleportPlayer(Siege.TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.DefenderNotOwner, MapRegionTable.TeleportWhereType.Town);
// Teleport to the second closest town
teleportPlayer(Siege.TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
// Flag so that siege instance can be started
_isInProgress = false;
@@ -573,10 +573,10 @@ public class Siege
}
// Teleport to the second closest town
teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.SiegeFlag);
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.SiegeFlag);
// Teleport to the second closest town
teleportPlayer(Siege.TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Spectator, MapRegionTable.TeleportWhereType.Town);
// Removes defenders' flags
removeDefenderFlags();
@@ -639,7 +639,7 @@ public class Siege
updatePlayerSiegeStateFlags(false);
// Teleport to the closest town
teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
teleportPlayer(TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town);
_controlTowerCount = 0;
_controlTowerMaxCount = 0;
@@ -1206,7 +1206,7 @@ public class Siege
_siegeRegistrationEndDate.add(Calendar.DAY_OF_MONTH, -1);
// Schedule siege auto start
ThreadPool.schedule(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
ThreadPool.schedule(new ScheduleStartSiegeTask(getCastle()), 1000);
}
/**

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java
View File

@@ -127,7 +127,7 @@ public class BanditStrongholdSiege extends ClanHallSiege
public void startSecondStep(L2Clan winner)
{
final List<String> winPlayers = BanditStrongholdSiege.getInstance().getRegisteredPlayers(winner);
final List<String> winPlayers = getInstance().getRegisteredPlayers(winner);
unSpawnAll();
_clansInfo.clear();
final clanPlayersInfo regPlayers = new clanPlayersInfo();

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/entity/siege/clanhalls/WildBeastFarmSiege.java
View File

@@ -119,7 +119,7 @@ public class WildBeastFarmSiege extends ClanHallSiege
public void startSecondStep(L2Clan winner)
{
final List<String> winPlayers = WildBeastFarmSiege.getInstance().getRegisteredPlayers(winner);
final List<String> winPlayers = getInstance().getRegisteredPlayers(winner);
unSpawnAll();
_clansInfo.clear();
final clanPlayersInfo regPlayers = new clanPlayersInfo();

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/multisell/L2Multisell.java
View File

@@ -101,7 +101,7 @@ public class L2Multisell
*/
private MultiSellListContainer generateMultiSell(int listId, boolean inventoryOnly, L2PcInstance player, double taxRate)
{
MultiSellListContainer listTemplate = L2Multisell.getInstance().getList(listId);
MultiSellListContainer listTemplate = getInstance().getList(listId);
MultiSellListContainer list = new MultiSellListContainer();
if (listTemplate == null)

38
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -264,7 +264,7 @@ public class Quest extends ManagedScript
public QuestState newQuestState(L2PcInstance player)
{
QuestState qs = new QuestState(this, player, getInitialState());
Quest.createQuestInDb(qs);
createQuestInDb(qs);
return qs;
}
@@ -933,14 +933,14 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addStartNpc(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.QUEST_START);
return addEventId(npcId, QuestEventType.QUEST_START);
}
public void addStartNpc(int... npcIds)
{
for (int npcId : npcIds)
{
addEventId(npcId, Quest.QuestEventType.QUEST_START);
addEventId(npcId, QuestEventType.QUEST_START);
}
}
@@ -951,14 +951,14 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addFirstTalkId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.NPC_FIRST_TALK);
return addEventId(npcId, QuestEventType.NPC_FIRST_TALK);
}
public void addFirstTalkId(int... npcIds)
{
for (int npcId : npcIds)
{
addEventId(npcId, Quest.QuestEventType.NPC_FIRST_TALK);
addEventId(npcId, QuestEventType.NPC_FIRST_TALK);
}
}
@@ -970,14 +970,14 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addAttackId(int attackId)
{
return addEventId(attackId, Quest.QuestEventType.ON_ATTACK);
return addEventId(attackId, QuestEventType.ON_ATTACK);
}
public void addAttackId(int... attackIds)
{
for (int attackId : attackIds)
{
addEventId(attackId, Quest.QuestEventType.ON_ATTACK);
addEventId(attackId, QuestEventType.ON_ATTACK);
}
}
@@ -989,7 +989,7 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addKillId(int killId)
{
return addEventId(killId, Quest.QuestEventType.ON_KILL);
return addEventId(killId, QuestEventType.ON_KILL);
}
/**
@@ -1000,7 +1000,7 @@ public class Quest extends ManagedScript
{
for (int killId : killIds)
{
addEventId(killId, Quest.QuestEventType.ON_KILL);
addEventId(killId, QuestEventType.ON_KILL);
}
}
@@ -1012,7 +1012,7 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addTalkId(int talkId)
{
return addEventId(talkId, Quest.QuestEventType.QUEST_TALK);
return addEventId(talkId, QuestEventType.QUEST_TALK);
}
/**
@@ -1023,13 +1023,13 @@ public class Quest extends ManagedScript
{
for (int talkId : talkIds)
{
addEventId(talkId, Quest.QuestEventType.QUEST_TALK);
addEventId(talkId, QuestEventType.QUEST_TALK);
}
}
public L2NpcTemplate addFactionCallId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.ON_FACTION_CALL);
return addEventId(npcId, QuestEventType.ON_FACTION_CALL);
}
/**
@@ -1040,20 +1040,20 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addSkillUseId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.ON_SKILL_USE);
return addEventId(npcId, QuestEventType.ON_SKILL_USE);
}
public void addSkillUseId(int... npcIds)
{
for (int npcId : npcIds)
{
addEventId(npcId, Quest.QuestEventType.ON_SKILL_USE);
addEventId(npcId, QuestEventType.ON_SKILL_USE);
}
}
public L2NpcTemplate addSpellFinishedId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.ON_SPELL_FINISHED);
return addEventId(npcId, QuestEventType.ON_SPELL_FINISHED);
}
/**
@@ -1064,27 +1064,27 @@ public class Quest extends ManagedScript
*/
public L2NpcTemplate addAggroRangeEnterId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.ON_AGGRO_RANGE_ENTER);
return addEventId(npcId, QuestEventType.ON_AGGRO_RANGE_ENTER);
}
public void addAggroRangeEnterId(int... npcIds)
{
for (int npcId : npcIds)
{
addEventId(npcId, Quest.QuestEventType.ON_AGGRO_RANGE_ENTER);
addEventId(npcId, QuestEventType.ON_AGGRO_RANGE_ENTER);
}
}
public L2NpcTemplate addSpawnId(int npcId)
{
return addEventId(npcId, Quest.QuestEventType.ON_SPAWN);
return addEventId(npcId, QuestEventType.ON_SPAWN);
}
public void addSpawnId(int... npcIds)
{
for (int npcId : npcIds)
{
addEventId(npcId, Quest.QuestEventType.ON_SPAWN);
addEventId(npcId, QuestEventType.ON_SPAWN);
}
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/spawn/L2Spawn.java
View File

@@ -593,7 +593,7 @@ public class L2Spawn
// Init other values of the L2NpcInstance (ex : from its L2CharTemplate for INT, STR, DEX...) and add it in the world as a visible object
mob.spawnMe(newlocx, newlocy, newlocz);
L2Spawn.notifyNpcSpawned(mob);
notifyNpcSpawned(mob);
_lastSpawn = mob;

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/waypoint/WayPointNode.java
View File

@@ -203,7 +203,7 @@ public class WayPointNode extends L2Object
y1 = y1 + ((modY * diffY) / steps);
z1 = z1 + ((modZ * diffZ) / steps);
lineNodes.add(WayPointNode.spawn(LINE_TYPE, _lineId, x1, y1, z1));
lineNodes.add(spawn(LINE_TYPE, _lineId, x1, y1, z1));
}
nodeA.addLineInfo(nodeB, lineNodes);

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util;
public final class Say2 extends L2GameClientPacket
{
private static Logger LOGGER = Logger.getLogger(Say2.class.getName());
private static java.util.logging.Logger _logChat = java.util.logging.Logger.getLogger("chat");
private static Logger _logChat = Logger.getLogger("chat");
public static final int ALL = 0;
public static final int SHOUT = 1; // !

11
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
View File

@@ -17,7 +17,6 @@
package com.l2jmobius.gameserver.network.serverpackets;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.TradeList;
import com.l2jmobius.gameserver.model.TradeList.TradeItem;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -34,8 +33,8 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
private final L2PcInstance _activeChar;
private int _playerAdena;
private final boolean _packageSale;
private final TradeList.TradeItem[] _itemList;
private final TradeList.TradeItem[] _sellList;
private final TradeItem[] _itemList;
private final TradeItem[] _sellList;
public PrivateStoreManageListSell(L2PcInstance player)
{
@@ -70,7 +69,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
// section2
writeD(_itemList.length - _sellList.length); // for potential sells
for (TradeList.TradeItem item : _itemList)
for (TradeItem item : _itemList)
{
if (isItemInSelling(item) == false)
{
@@ -87,7 +86,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
}
// section 3
writeD(_sellList.length); // count for any items already added for sell
for (TradeList.TradeItem item : _sellList)
for (TradeItem item : _sellList)
{
writeD(item.getItem().getType2());
writeD(item.getObjectId());
@@ -104,7 +103,7 @@ public class PrivateStoreManageListSell extends L2GameServerPacket
private boolean isItemInSelling(TradeItem item_)
{
for (TradeList.TradeItem itemSell : _sellList)
for (TradeItem itemSell : _sellList)
{
if (itemSell.getObjectId() == item_.getObjectId())
{

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/Formulas.java
View File

@@ -1042,11 +1042,11 @@ public final class Formulas
// SevenSigns Festival modifier
if (SevenSignsFestival.getInstance().isFestivalInProgress() && player.isFestivalParticipant())
{
hpRegenMultiplier *= Formulas.calcFestivalRegenModifier(player);
hpRegenMultiplier *= calcFestivalRegenModifier(player);
}
else
{
final double siegeModifier = Formulas.calcSiegeRegenModifer(player);
final double siegeModifier = calcSiegeRegenModifer(player);
if (siegeModifier > 0)
{
hpRegenMultiplier *= siegeModifier;
@@ -1374,7 +1374,7 @@ public final class Formulas
/*
* skill critical effects (skill damage x2) have been added
*/
if (Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.DEX.calcBonus(attacker)))
if (calcCrit(skill.getBaseCritRate() * 10 * BaseStats.DEX.calcBonus(attacker)))
{
damage *= 2;
}

12
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/skills/hitConditionBonus.java
View File

@@ -50,17 +50,17 @@ public class hitConditionBonus
// Get high or low bonus
if ((attacker.getZ() - target.getZ()) > 50)
{
mod += hitConditionBonus.highBonus;
mod += highBonus;
}
else if ((attacker.getZ() - target.getZ()) < -50)
{
mod += hitConditionBonus.lowBonus;
mod += lowBonus;
}
// Get weather bonus
if (GameTimeController.getInstance().isNowNight())
{
mod += hitConditionBonus.darkBonus;
mod += darkBonus;
// else if () No rain support yet.
// chance += hitConditionBonus.rainBonus;
}
@@ -68,15 +68,15 @@ public class hitConditionBonus
// Get side bonus
if (attacker.isBehindTarget())
{
mod += hitConditionBonus.backBonus;
mod += backBonus;
}
else if (attacker.isFrontTarget())
{
mod += hitConditionBonus.frontBonus;
mod += frontBonus;
}
else
{
mod += hitConditionBonus.sideBonus;
mod += sideBonus;
}
// If (mod / 10) is less than 0, return 0, because we cant lower more than 100%.

52
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/chars/L2NpcTemplate.java
View File

@@ -381,132 +381,132 @@ public final class L2NpcTemplate extends L2CharTemplate
{
case 1:
{
race = L2NpcTemplate.Race.UNDEAD;
race = Race.UNDEAD;
break;
}
case 2:
{
race = L2NpcTemplate.Race.MAGICCREATURE;
race = Race.MAGICCREATURE;
break;
}
case 3:
{
race = L2NpcTemplate.Race.BEAST;
race = Race.BEAST;
break;
}
case 4:
{
race = L2NpcTemplate.Race.ANIMAL;
race = Race.ANIMAL;
break;
}
case 5:
{
race = L2NpcTemplate.Race.PLANT;
race = Race.PLANT;
break;
}
case 6:
{
race = L2NpcTemplate.Race.HUMANOID;
race = Race.HUMANOID;
break;
}
case 7:
{
race = L2NpcTemplate.Race.SPIRIT;
race = Race.SPIRIT;
break;
}
case 8:
{
race = L2NpcTemplate.Race.ANGEL;
race = Race.ANGEL;
break;
}
case 9:
{
race = L2NpcTemplate.Race.DEMON;
race = Race.DEMON;
break;
}
case 10:
{
race = L2NpcTemplate.Race.DRAGON;
race = Race.DRAGON;
break;
}
case 11:
{
race = L2NpcTemplate.Race.GIANT;
race = Race.GIANT;
break;
}
case 12:
{
race = L2NpcTemplate.Race.BUG;
race = Race.BUG;
break;
}
case 13:
{
race = L2NpcTemplate.Race.FAIRIE;
race = Race.FAIRIE;
break;
}
case 14:
{
race = L2NpcTemplate.Race.HUMAN;
race = Race.HUMAN;
break;
}
case 15:
{
race = L2NpcTemplate.Race.ELVE;
race = Race.ELVE;
break;
}
case 16:
{
race = L2NpcTemplate.Race.DARKELVE;
race = Race.DARKELVE;
break;
}
case 17:
{
race = L2NpcTemplate.Race.ORC;
race = Race.ORC;
break;
}
case 18:
{
race = L2NpcTemplate.Race.DWARVE;
race = Race.DWARVE;
break;
}
case 19:
{
race = L2NpcTemplate.Race.OTHER;
race = Race.OTHER;
break;
}
case 20:
{
race = L2NpcTemplate.Race.NONLIVING;
race = Race.NONLIVING;
break;
}
case 21:
{
race = L2NpcTemplate.Race.SIEGEWEAPON;
race = Race.SIEGEWEAPON;
break;
}
case 22:
{
race = L2NpcTemplate.Race.DEFENDINGARMY;
race = Race.DEFENDINGARMY;
break;
}
case 23:
{
race = L2NpcTemplate.Race.MERCENARIE;
race = Race.MERCENARIE;
break;
}
default:
{
race = L2NpcTemplate.Race.UNKNOWN;
race = Race.UNKNOWN;
break;
}
}
}
public L2NpcTemplate.Race getRace()
public Race getRace()
{
if (race == null)
{
race = L2NpcTemplate.Race.UNKNOWN;
race = Race.UNKNOWN;
}
return race;

46
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/templates/item/L2Item.java
View File

@@ -208,117 +208,117 @@ public abstract class L2Item
{
case "chest":
{
_bodyPart = L2Item.SLOT_CHEST;
_bodyPart = SLOT_CHEST;
break;
}
case "fullarmor":
{
_bodyPart = L2Item.SLOT_FULL_ARMOR;
_bodyPart = SLOT_FULL_ARMOR;
break;
}
case "head":
{
_bodyPart = L2Item.SLOT_HEAD;
_bodyPart = SLOT_HEAD;
break;
}
case "hair":
{
_bodyPart = L2Item.SLOT_HAIR;
_bodyPart = SLOT_HAIR;
break;
}
case "face":
{
_bodyPart = L2Item.SLOT_FACE;
_bodyPart = SLOT_FACE;
break;
}
case "dhair":
{
_bodyPart = L2Item.SLOT_DHAIR;
_bodyPart = SLOT_DHAIR;
break;
}
case "underwear":
{
_bodyPart = L2Item.SLOT_UNDERWEAR;
_bodyPart = SLOT_UNDERWEAR;
break;
}
case "back":
{
_bodyPart = L2Item.SLOT_BACK;
_bodyPart = SLOT_BACK;
break;
}
case "neck":
{
_bodyPart = L2Item.SLOT_NECK;
_bodyPart = SLOT_NECK;
break;
}
case "legs":
{
_bodyPart = L2Item.SLOT_LEGS;
_bodyPart = SLOT_LEGS;
break;
}
case "feet":
{
_bodyPart = L2Item.SLOT_FEET;
_bodyPart = SLOT_FEET;
break;
}
case "gloves":
{
_bodyPart = L2Item.SLOT_GLOVES;
_bodyPart = SLOT_GLOVES;
break;
}
case "chest,legs":
{
_bodyPart = L2Item.SLOT_CHEST | L2Item.SLOT_LEGS;
_bodyPart = SLOT_CHEST | SLOT_LEGS;
break;
}
case "rhand":
{
_bodyPart = L2Item.SLOT_R_HAND;
_bodyPart = SLOT_R_HAND;
break;
}
case "lhand":
{
_bodyPart = L2Item.SLOT_L_HAND;
_bodyPart = SLOT_L_HAND;
break;
}
case "lrhand":
{
_bodyPart = L2Item.SLOT_LR_HAND;
_bodyPart = SLOT_LR_HAND;
break;
}
case "rear,lear":
{
_bodyPart = L2Item.SLOT_R_EAR | L2Item.SLOT_L_EAR;
_bodyPart = SLOT_R_EAR | SLOT_L_EAR;
break;
}
case "rfinger,lfinger":
{
_bodyPart = L2Item.SLOT_R_FINGER | L2Item.SLOT_L_FINGER;
_bodyPart = SLOT_R_FINGER | SLOT_L_FINGER;
break;
}
case "wolf":
{
_bodyPart = L2Item.SLOT_WOLF;
_bodyPart = SLOT_WOLF;
break;
}
case "hatchling":
{
_bodyPart = L2Item.SLOT_HATCHLING;
_bodyPart = SLOT_HATCHLING;
break;
}
case "strider":
{
_bodyPart = L2Item.SLOT_STRIDER;
_bodyPart = SLOT_STRIDER;
break;
}
case "babypet":
{
_bodyPart = L2Item.SLOT_BABYPET;
_bodyPart = SLOT_BABYPET;
break;
}
default: // "none"
{
_bodyPart = L2Item.SLOT_NONE;
_bodyPart = SLOT_NONE;
break;
}
}

2
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/thread/LoginServerThread.java
View File

@@ -559,7 +559,7 @@ public class LoginServerThread extends Thread
if (_accountsInGameServer.get(account) != null)
{
_accountsInGameServer.get(account).closeNow();
LoginServerThread.getInstance().sendLogout(account);
getInstance().sendLogout(account);
if (Config.DEBUG)
{

4
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/FloodProtectorAction.java
View File

@@ -278,7 +278,7 @@ public final class FloodProtectorAction
{
if (client.getActiveChar() != null)
{
client.getActiveChar().setPunishLevel(L2PcInstance.PunishLevel.ACC, config.PUNISHMENT_TIME);
client.getActiveChar().setPunishLevel(PunishLevel.ACC, config.PUNISHMENT_TIME);
LOGGER(client.getActiveChar().getName() + " banned for flooding");
@@ -297,7 +297,7 @@ public final class FloodProtectorAction
{
if (client.getActiveChar() != null)
{
client.getActiveChar().setPunishLevel(L2PcInstance.PunishLevel.JAIL, config.PUNISHMENT_TIME);
client.getActiveChar().setPunishLevel(PunishLevel.JAIL, config.PUNISHMENT_TIME);
LOGGER.warning(client.getActiveChar().getName() + " jailed for flooding");
}