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

Proper syntax for several methods and values.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-01-26 14:05:47 +00:00
parent 8e7ecd2ac0
commit 9d155febb7
6555 changed files with 39425 additions and 39342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java
Vendored
+4 -4
View File
@@ -458,7 +458,7 @@ public class Antharas extends Quest
_antharas = (GrandBossInstance) antharasSpawn.doSpawn();
GrandBossManager.getInstance().addBoss(_antharas);
_monsters.add(_antharas);
_antharas.setIsImobilised(true);
_antharas.setImmobilized(true);
GrandBossManager.getInstance().setBossStatus(ANTHARASOLDID, DORMANT);
GrandBossManager.getInstance().setBossStatus(npcId, FIGHTING);
_LastAction = System.currentTimeMillis();
@@ -883,7 +883,7 @@ public class Antharas extends Quest
@Override
public void run()
{
_boss.setIsImobilised(false);
_boss.setImmobilized(false);
// When it is possible to act, a social action is canceled.
if (_socialTask != null)
@@ -916,7 +916,7 @@ public class Antharas extends Quest
@Override
public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet)
{
if (((npc.getSpawn() != null) && !npc.getSpawn().is_customBossInstance() && (npc.getNpcId() == 29019)) || (npc.getNpcId() == 29066) || (npc.getNpcId() == 29067) || (npc.getNpcId() == 29068))
if (((npc.getSpawn() != null) && !npc.getSpawn().isCustomBossInstance() && (npc.getNpcId() == 29019)) || (npc.getNpcId() == 29066) || (npc.getNpcId() == 29067) || (npc.getNpcId() == 29068))
{
_LastAction = System.currentTimeMillis();
/*
@@ -960,7 +960,7 @@ public class Antharas extends Quest
{
npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
_cubeSpawnTask = ThreadPool.schedule(new CubeSpawn(0), 10000);
GrandBossManager.getInstance().setBossStatus(npc.getNpcId(), DEAD);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java
Vendored
+13 -13
View File
@@ -156,8 +156,8 @@ public class Baium extends Quest
try
{
baium.setCurrentHpMp(hp, mp);
baium.setIsInvul(true);
// _baium.setIsImobilised(true);
baium.setInvul(true);
// _baium.setImobilised(true);
baium.broadcastPacket(new SocialAction(baium.getObjectId(), 2));
startQuestTimer("baium_wakeup", 15000, baium, null);
}
@@ -206,7 +206,7 @@ public class Baium extends Quest
// start monitoring baium's inactivity
_lastAttackVsBaiumTime = System.currentTimeMillis();
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
startQuestTimer("baium_despawn", 60000, npc, null, true);
}
@@ -224,8 +224,8 @@ public class Baium extends Quest
{
try
{
baium.setIsInvul(false);
// baium.setIsImobilised(false);
baium.setInvul(false);
// baium.setImobilised(false);
// for (NpcInstance minion : _Minions)
// minion.setShowSummonAnimation(false);
baium.getAttackByList().addAll(_zone.getCharactersInside().values());
@@ -240,7 +240,7 @@ public class Baium extends Quest
for (int[] element : ANGEL_LOCATION)
{
final MonsterInstance angel = (MonsterInstance) addSpawn(ARCHANGEL, element[0], element[1], element[2], element[3], false, 0);
angel.setIsInvul(true);
angel.setInvul(true);
_minions.add(angel);
angel.getAttackByList().addAll(_zone.getCharactersInside().values());
angel.isAggressive();
@@ -277,10 +277,10 @@ public class Baium extends Quest
}
else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0)))
{
// npc.setIsCastingNow(false); //just in case
// npc.setCastingNow(false); //just in case
npc.setTarget(npc);
npc.doCast(SkillTable.getInstance().getInfo(4135, 1));
// npc.setIsCastingNow(true);
// npc.setCastingNow(true);
}
}
}
@@ -317,7 +317,7 @@ public class Baium extends Quest
{
try
{
baium.setIsInvul(true);
baium.setInvul(true);
baium.setRunning();
baium.broadcastPacket(new SocialAction(baium.getObjectId(), 2));
startQuestTimer("baium_wakeup", 15000, baium, player);
@@ -420,7 +420,7 @@ public class Baium extends Quest
{
npc.broadcastPacket(new PlaySound(1, "BS01_D", npc));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
cancelQuestTimer("baium_despawn", npc, null);
// spawn the "Teleportation Cubic" for 15 minutes (to allow players to exit the lair)
@@ -524,7 +524,7 @@ public class Baium extends Quest
}
if ((target == null) || target.isDead() || !(_zone.isInsideZone(target)))
{
// npc.setIsCastingNow(false);
// npc.setCastingNow(false);
return;
}
@@ -532,7 +532,7 @@ public class Baium extends Quest
{
npc.getAI().setIntention(AI_INTENTION_IDLE);
npc.setTarget(target);
// npc.setIsCastingNow(true);
// npc.setCastingNow(true);
if (getDist(skill.getCastRange()) > 0)
{
npc.broadcastPacket(new MoveToPawn(npc, target, getDist(skill.getCastRange())));
@@ -551,7 +551,7 @@ public class Baium extends Quest
else
{
npc.getAI().setIntention(AI_INTENTION_FOLLOW, target, null);
// npc.setIsCastingNow(false);
// npc.setCastingNow(false);
}
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java
Vendored
+1 -1
View File
@@ -231,7 +231,7 @@ public class Benom extends Quest
}
case "BenomWalkFinish":
{
if (npc.getCastle().getSiege().getIsInProgress())
if (npc.getCastle().getSiege().isInProgress())
{
cancelQuestTimer("Attacking", npc, player);
npc.teleToLocation(WALK_ROUTES[_benomWalkRouteStep], false);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java
Vendored
+1 -1
View File
@@ -230,7 +230,7 @@ public class Core extends Quest
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), 0, name, "......"));
_firstAttacked = false;
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
addSpawn(31842, 16502, 110165, -6394, 0, false, 900000);
addSpawn(31842, 18948, 110166, -6397, 0, false, 900000);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java
Vendored
+50 -50
View File
@@ -540,26 +540,26 @@ public class Frintezza extends Quest
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, FIGHTING);
_frintezzaDummy = addSpawn(29052, 174240, -89805, -5022, 16048, false, 0);
_frintezzaDummy.setIsInvul(true);
_frintezzaDummy.setIsImobilised(true);
_frintezzaDummy.setInvul(true);
_frintezzaDummy.setImmobilized(true);
_overheadDummy = addSpawn(29052, 174232, -88020, -5110, 16384, false, 0);
_overheadDummy.setIsInvul(true);
_overheadDummy.setIsImobilised(true);
_overheadDummy.setInvul(true);
_overheadDummy.setImmobilized(true);
_overheadDummy.setCollisionHeight(600);
_zone.broadcastPacket(new NpcInfo(_overheadDummy, null));
_portraitDummy1 = addSpawn(29052, 172450, -87890, -5100, 16048, false, 0);
_portraitDummy1.setIsImobilised(true);
_portraitDummy1.setIsInvul(true);
_portraitDummy1.setImmobilized(true);
_portraitDummy1.setInvul(true);
_portraitDummy3 = addSpawn(29052, 176012, -87890, -5100, 16048, false, 0);
_portraitDummy3.setIsImobilised(true);
_portraitDummy3.setIsInvul(true);
_portraitDummy3.setImmobilized(true);
_portraitDummy3.setInvul(true);
_scarletDummy = addSpawn(29053, 174232, -88020, -5110, 16384, false, 0);
_scarletDummy.setIsInvul(true);
_scarletDummy.setIsImobilised(true);
_scarletDummy.setInvul(true);
_scarletDummy.setImmobilized(true);
startQuestTimer("stop_pc", 0, npc, null);
startQuestTimer("camera_2", 1000, _overheadDummy, null);
@@ -580,28 +580,28 @@ public class Frintezza extends Quest
_frintezza = (GrandBossInstance) addSpawn(FRINTEZZA, 174240, -89805, -5022, 16048, false, 0);
GrandBossManager.getInstance().addBoss(_frintezza);
_frintezza.setIsImobilised(true);
_frintezza.setIsInvul(true);
_frintezza.setImmobilized(true);
_frintezza.setInvul(true);
_frintezza.disableAllSkills();
_zone.updateKnownList(_frintezza);
_demon2 = (MonsterInstance) addSpawn(29051, 175876, -88713, -5100, 28205, false, 0);
_demon2.setIsImobilised(true);
_demon2.setImmobilized(true);
_demon2.disableAllSkills();
_zone.updateKnownList(_demon2);
_demon3 = (MonsterInstance) addSpawn(29051, 172608, -88702, -5100, 64817, false, 0);
_demon3.setIsImobilised(true);
_demon3.setImmobilized(true);
_demon3.disableAllSkills();
_zone.updateKnownList(_demon3);
_demon1 = (MonsterInstance) addSpawn(29050, 175833, -87165, -5100, 35048, false, 0);
_demon1.setIsImobilised(true);
_demon1.setImmobilized(true);
_demon1.disableAllSkills();
_zone.updateKnownList(_demon1);
_demon4 = (MonsterInstance) addSpawn(29050, 172634, -87165, -5100, 57730, false, 0);
_demon4.setIsImobilised(true);
_demon4.setImmobilized(true);
_demon4.disableAllSkills();
_zone.updateKnownList(_demon4);
@@ -736,8 +736,8 @@ public class Frintezza extends Quest
_zone.broadcastPacket(new MagicSkillUse(_scarletDummy, _overheadDummy, 5004, 1, 5800, 0));
_weakScarlet = (GrandBossInstance) addSpawn(SCARLET1, 174232, -88020, -5110, 16384, false, 0);
_weakScarlet.setIsInvul(true);
_weakScarlet.setIsImobilised(true);
_weakScarlet.setInvul(true);
_weakScarlet.setImmobilized(true);
_weakScarlet.disableAllSkills();
_zone.updateKnownList(_weakScarlet);
_activeScarlet = _weakScarlet;
@@ -770,22 +770,22 @@ public class Frintezza extends Quest
else if (event.equals("camera_22"))
{
_portrait2 = (MonsterInstance) addSpawn(29049, 175876, -88713, -5000, 28205, false, 0);
_portrait2.setIsImobilised(true);
_portrait2.setImmobilized(true);
_portrait2.disableAllSkills();
_zone.updateKnownList(_portrait2);
_portrait3 = (MonsterInstance) addSpawn(29049, 172608, -88702, -5000, 64817, false, 0);
_portrait3.setIsImobilised(true);
_portrait3.setImmobilized(true);
_portrait3.disableAllSkills();
_zone.updateKnownList(_portrait3);
_portrait1 = (MonsterInstance) addSpawn(29048, 175833, -87165, -5000, 35048, false, 0);
_portrait1.setIsImobilised(true);
_portrait1.setImmobilized(true);
_portrait1.disableAllSkills();
_zone.updateKnownList(_portrait1);
_portrait4 = (MonsterInstance) addSpawn(29048, 172634, -87165, -5000, 57730, false, 0);
_portrait4.setIsImobilised(true);
_portrait4.setImmobilized(true);
_portrait4.disableAllSkills();
_zone.updateKnownList(_portrait4);
@@ -802,24 +802,24 @@ public class Frintezza extends Quest
}
else if (event.equals("camera_23"))
{
_demon1.setIsImobilised(false);
_demon2.setIsImobilised(false);
_demon3.setIsImobilised(false);
_demon4.setIsImobilised(false);
_demon1.setImmobilized(false);
_demon2.setImmobilized(false);
_demon3.setImmobilized(false);
_demon4.setImmobilized(false);
_demon1.enableAllSkills();
_demon2.enableAllSkills();
_demon3.enableAllSkills();
_demon4.enableAllSkills();
_portrait1.setIsImobilised(false);
_portrait2.setIsImobilised(false);
_portrait3.setIsImobilised(false);
_portrait4.setIsImobilised(false);
_portrait1.setImmobilized(false);
_portrait2.setImmobilized(false);
_portrait3.setImmobilized(false);
_portrait4.setImmobilized(false);
_portrait1.enableAllSkills();
_portrait2.enableAllSkills();
_portrait3.enableAllSkills();
_portrait4.enableAllSkills();
_weakScarlet.setIsInvul(false);
_weakScarlet.setIsImobilised(false);
_weakScarlet.setInvul(false);
_weakScarlet.setImmobilized(false);
_weakScarlet.enableAllSkills();
_weakScarlet.setRunning();
@@ -837,7 +837,7 @@ public class Frintezza extends Quest
creature.disableAllSkills();
creature.setTarget(null);
creature.stopMove(null);
creature.setIsImobilised(true);
creature.setImmobilized(true);
creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
}
@@ -860,14 +860,14 @@ public class Frintezza extends Quest
if (creature != _frintezza)
{
creature.enableAllSkills();
creature.setIsImobilised(false);
creature.setImmobilized(false);
}
}
}
else if (event.equals("start_npc"))
{
npc.setRunning();
npc.setIsInvul(false);
npc.setInvul(false);
}
else if (event.equals("morph_end"))
{
@@ -926,8 +926,8 @@ public class Frintezza extends Quest
_weakScarlet = null;
_activeScarlet = null;
_weakScarlet = (GrandBossInstance) addSpawn(SCARLET1, _scarletX, _scarletY, _scarletZ, _scarletHeading, false, 0);
_weakScarlet.setIsInvul(true);
_weakScarlet.setIsImobilised(true);
_weakScarlet.setInvul(true);
_weakScarlet.setImmobilized(true);
_weakScarlet.disableAllSkills();
_weakScarlet.setRHandId(7903);
_zone.updateKnownList(_weakScarlet);
@@ -971,8 +971,8 @@ public class Frintezza extends Quest
else if (event.equals("morph_13"))
{
_strongScarlet = (GrandBossInstance) addSpawn(SCARLET2, reverseXFix(_scarletX), reverseYFix(_scarletY), reverseZFix(_scarletZ), _scarletHeading, false, 0);
_strongScarlet.setIsInvul(true);
_strongScarlet.setIsImobilised(true);
_strongScarlet.setInvul(true);
_strongScarlet.setImmobilized(true);
_strongScarlet.disableAllSkills();
_zone.updateKnownList(_strongScarlet);
_activeScarlet = _strongScarlet;
@@ -1188,8 +1188,8 @@ public class Frintezza extends Quest
creature.abortCast();
creature.disableAllSkills();
creature.stopMove(null);
creature.setIsImobilised(true);
creature.setIsParalyzed(true);
creature.setImmobilized(true);
creature.setParalyzed(true);
creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
skill.getEffects(_frintezza, creature, false, false, false);
creature.startAbnormalEffect(Creature.ABNORMAL_EFFECT_DANCE_STUNNED);
@@ -1208,8 +1208,8 @@ public class Frintezza extends Quest
creature.stopAbnormalEffect(Creature.ABNORMAL_EFFECT_DANCE_STUNNED);
creature.stopAbnormalEffect(Creature.ABNORMAL_EFFECT_FLOATING_ROOT);
creature.enableAllSkills();
creature.setIsImobilised(false);
creature.setIsParalyzed(false);
creature.setImmobilized(false);
creature.setParalyzed(false);
}
}
_abnormal = 0;
@@ -1262,7 +1262,7 @@ public class Frintezza extends Quest
if (skill != null)
{
_weakScarlet.stopMove(null);
// weakScarlet.setIsCastingNow(true);
// weakScarlet.setCastingNow(true);
_weakScarlet.doCast(skill);
}
startQuestTimer("skill01", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
@@ -1286,7 +1286,7 @@ public class Frintezza extends Quest
if (skill != null)
{
_weakScarlet.stopMove(null);
// weakScarlet.setIsCastingNow(true);
// weakScarlet.setCastingNow(true);
_weakScarlet.doCast(skill);
}
startQuestTimer("skill02", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
@@ -1316,7 +1316,7 @@ public class Frintezza extends Quest
if (skill != null)
{
_strongScarlet.stopMove(null);
// strongScarlet.setIsCastingNow(true);
// strongScarlet.setCastingNow(true);
_strongScarlet.doCast(skill);
}
startQuestTimer("skill03", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
@@ -1344,8 +1344,8 @@ public class Frintezza extends Quest
creature.abortCast();
creature.disableAllSkills();
creature.stopMove(null);
creature.setIsImobilised(true);
creature.setIsParalyzed(true);
creature.setImmobilized(true);
creature.setParalyzed(true);
creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
creature.startAbnormalEffect(Creature.ABNORMAL_EFFECT_FLOATING_ROOT);
}
@@ -1700,7 +1700,7 @@ public class Frintezza extends Quest
final Skill skill = SkillTable.getInstance().getInfo(5011, 1);
if (skill != null)
{
// npc.setIsCastingNow(true);
// npc.setCastingNow(true);
npc.doCast(skill);
}
}
@@ -1726,7 +1726,7 @@ public class Frintezza extends Quest
}
else if ((npc.getNpcId() == SCARLET2) && (_onCheck == 1) && (status == FIGHTING))
{
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
// cancelQuestTimer("loc_check");
cancelQuestTimer("spawn_minion", npc, null);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java
Vendored
+3 -3
View File
@@ -410,12 +410,12 @@ public class IceFairySirra extends Quest
}
}
public String getHtmlPath(int val)
public String getHtmlPath(int value)
{
String pom = "";
pom = "32029-" + val;
if (val == 0)
pom = "32029-" + value;
if (value == 0)
{
pom = "32029";
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java
Vendored
+2 -2
View File
@@ -150,7 +150,7 @@ public class Orfen extends Quest
break;
}
double hp = -1;
if ((npc.getNpcId() == ORFEN) && !npc.getSpawn().is_customBossInstance())
if ((npc.getNpcId() == ORFEN) && !npc.getSpawn().isCustomBossInstance())
{
hp = GrandBossManager.getInstance().getStatsSet(ORFEN).getDouble("currentHP");
if (hp < npc.getCurrentHp())
@@ -237,7 +237,7 @@ public class Orfen extends Quest
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
// time is 48hour +/- 20hour
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java
Vendored
+5 -5
View File
@@ -158,9 +158,9 @@ public class QueenAnt extends Quest
startQuestTimer("HEAL", 1000, null, null, true);
_queen = npc;
_larva = (MonsterInstance) addSpawn(LARVA, -21600, 179482, -5846, Rnd.get(360), false, 0);
_larva.setIsUnkillable(true);
_larva.setIsImobilised(true);
_larva.setIsAttackDisabled(true);
_larva.setUnkillable(true);
_larva.setImmobilized(true);
_larva.setAttackDisabled(true);
}
@Override
@@ -195,7 +195,7 @@ public class QueenAnt extends Quest
final int x = (int) (radius * Math.cos(i * 1.407)); // 1.407~2pi/6
final int y = (int) (radius * Math.sin(i * 1.407));
_nurses.add((MonsterInstance) addSpawn(NURSE, npc.getX() + x, npc.getY() + y, npc.getZ(), 0, false, 0));
_nurses.get(i).setIsAttackDisabled(true);
_nurses.get(i).setAttackDisabled(true);
}
break;
}
@@ -368,7 +368,7 @@ public class QueenAnt extends Quest
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
// time is 36hour +/- 17hour
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java
Vendored
+9 -9
View File
@@ -178,7 +178,7 @@ public class Valakas extends Quest
temp = (System.currentTimeMillis() - lastAttackTime);
if ((status == FIGHTING) && !npc.getSpawn().is_customBossInstance() // if it's a custom spawn, dnt despawn it for inactivity
if ((status == FIGHTING) && !npc.getSpawn().isCustomBossInstance() // if it's a custom spawn, dnt despawn it for inactivity
&& (temp > (Config.VALAKAS_DESPAWN_TIME * 60000))) // 15 mins by default
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
@@ -284,7 +284,7 @@ public class Valakas extends Quest
{
GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
startQuestTimer("check_activity_and_do_actions", 60000, npc, null, true);
npc.setIsInvul(false);
npc.setInvul(false);
getRandomSkill(npc);
}
else if (event.equals("1111"))
@@ -321,7 +321,7 @@ public class Valakas extends Quest
{
npc.broadcastPacket(new SpecialCamera(npc.getObjectId(), 1700, 10, 0, 3000, 250));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
addSpawn(31759, 212852, -114842, -1632, 0, false, 900000);
final int radius = 1500;
@@ -381,7 +381,7 @@ public class Valakas extends Quest
}
lastAttackTime = System.currentTimeMillis();
/*
* if (!Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM && GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING && !npc.getSpawn().is_customBossInstance()) { attacker.teleToLocation(150037, -57255, -2976); }
* if (!Config.ALLOW_DIRECT_TP_TO_BOSS_ROOM && GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING && !npc.getSpawn().isCustomBossInstance()) { attacker.teleToLocation(150037, -57255, -2976); }
*/
if (attacker.getMountType() == 1)
{
@@ -602,7 +602,7 @@ public class Valakas extends Quest
npc.broadcastPacket(new PlaySound(1, "B03_D", npc));
startQuestTimer("1111", 500, npc, null);
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
@@ -952,14 +952,14 @@ public class Valakas extends Quest
{
timer.cancel();
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
// npc.setIsCastingNow(true);
// npc.setCastingNow(true);
npc.setTarget(target);
npc.doCast(skill);
}
else
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target, null);
// npc.setIsCastingNow(false);
// npc.setCastingNow(false);
}
}
@@ -1017,7 +1017,7 @@ public class Valakas extends Quest
final Integer status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
if ((status == FIGHTING) || npc.getSpawn().is_customBossInstance())
if ((status == FIGHTING) || npc.getSpawn().isCustomBossInstance())
{
if (npc.getCurrentHp() > ((npc.getMaxHp() * 1) / 4))
{
@@ -1524,7 +1524,7 @@ public class Valakas extends Quest
i_quest4 = ((1 * 1000) + Rnd.get(3000));
c_quest4 = player;
}
if ((status == FIGHTING) || (npc.getSpawn().is_customBossInstance() && !npc.isInvul()))
if ((status == FIGHTING) || (npc.getSpawn().isCustomBossInstance() && !npc.isInvul()))
{
getRandomSkill(npc);
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java
Vendored
+24 -24
View File
@@ -686,15 +686,15 @@ public class VanHalter extends Quest
protected void spawnVanHalter()
{
_vanHalter = (RaidBossInstance) _vanHalterSpawn.doSpawn();
// _vanHalter.setIsImmobilized(true);
_vanHalter.setIsInvul(true);
// _vanHalter.setImmobilized(true);
_vanHalter.setInvul(true);
_isHalterSpawned = true;
}
protected void deleteVanHalter()
{
// _vanHalter.setIsImmobilized(false);
_vanHalter.setIsInvul(false);
// _vanHalter.setImmobilized(false);
_vanHalter.setInvul(false);
_vanHalter.getSpawn().stopRespawn();
_vanHalter.deleteMe();
}
@@ -747,16 +747,16 @@ public class VanHalter extends Quest
protected void spawnRitualOffering()
{
_ritualOffering = _ritualOfferingSpawn.doSpawn();
// _ritualOffering.setIsImmobilized(true);
_ritualOffering.setIsInvul(true);
_ritualOffering.setIsParalyzed(true);
// _ritualOffering.setImmobilized(true);
_ritualOffering.setInvul(true);
_ritualOffering.setParalyzed(true);
}
protected void deleteRitualOffering()
{
// _ritualOffering.setIsImmobilized(false);
_ritualOffering.setIsInvul(false);
_ritualOffering.setIsParalyzed(false);
// _ritualOffering.setImmobilized(false);
_ritualOffering.setInvul(false);
_ritualOffering.setParalyzed(false);
_ritualOffering.getSpawn().stopRespawn();
_ritualOffering.deleteMe();
}
@@ -809,8 +809,8 @@ public class VanHalter extends Quest
protected void spawnRitualSacrifice()
{
_ritualSacrifice = _ritualSacrificeSpawn.doSpawn();
// _ritualSacrifice.setIsImmobilized(true);
_ritualSacrifice.setIsInvul(true);
// _ritualSacrifice.setImmobilized(true);
_ritualSacrifice.setInvul(true);
_isSacrificeSpawned = true;
}
@@ -833,7 +833,7 @@ public class VanHalter extends Quest
{
_cameraMarker.put(i, _cameraMarkerSpawn.get(i).doSpawn());
_cameraMarker.get(i).getSpawn().stopRespawn();
_cameraMarker.get(i).setIsImobilised(true);
_cameraMarker.get(i).setImmobilized(true);
}
}
@@ -1006,8 +1006,8 @@ public class VanHalter extends Quest
spawnGuardOfAltar();
openDoorOfSacrifice();
// _vanHalter.setIsImmobilized(true);
_vanHalter.setIsInvul(true);
// _vanHalter.setImmobilized(true);
_vanHalter.setInvul(true);
spawnCameraMarker();
if (_timeUpTask != null)
@@ -1087,7 +1087,7 @@ public class VanHalter extends Quest
if (_vanHalter.isAfraid())
{
_vanHalter.stopEffects(Effect.EffectType.FEAR);
_vanHalter.setIsAfraid(false);
_vanHalter.setAfraid(false);
_vanHalter.updateAbnormalEffect();
}
else
@@ -1099,7 +1099,7 @@ public class VanHalter extends Quest
if ((_vanHalter.getX() == pos.getX()) && (_vanHalter.getY() == pos.getY()))
{
_vanHalter.stopEffects(Effect.EffectType.FEAR);
_vanHalter.setIsAfraid(false);
_vanHalter.setAfraid(false);
_vanHalter.updateAbnormalEffect();
}
else
@@ -1127,7 +1127,7 @@ public class VanHalter extends Quest
else
{
_vanHalter.stopEffects(Effect.EffectType.FEAR);
_vanHalter.setIsAfraid(false);
_vanHalter.setAfraid(false);
_vanHalter.updateAbnormalEffect();
if (_halterEscapeTask != null)
{
@@ -1650,11 +1650,11 @@ public class VanHalter extends Quest
{
// High Priestess van Halter uses the skill to kill Ritual Offering.
final Skill skill = SkillTable.getInstance().getInfo(1168, 7);
_ritualOffering.setIsInvul(false);
_ritualOffering.setInvul(false);
_vanHalter.setTarget(_ritualOffering);
// _vanHalter.setIsImmobilized(false);
// _vanHalter.setImmobilized(false);
_vanHalter.doCast(skill);
// _vanHalter.setIsImmobilized(true);
// _vanHalter.setImmobilized(true);
// Set next task.
if (_movieTask != null)
{
@@ -1666,7 +1666,7 @@ public class VanHalter extends Quest
}
case 14:
{
_ritualOffering.setIsInvul(false);
_ritualOffering.setInvul(false);
_ritualOffering.reduceCurrentHp(_ritualOffering.getMaxHp() + 1, _vanHalter);
// Set next task.
if (_movieTask != null)
@@ -1721,8 +1721,8 @@ public class VanHalter extends Quest
{
deleteRitualSacrifice();
deleteCameraMarker();
// _vanHalter.setIsImmobilized(false);
_vanHalter.setIsInvul(false);
// _vanHalter.setImmobilized(false);
_vanHalter.setInvul(false);
if (_movieTask != null)
{
_movieTask.cancel(false);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java
Vendored
+1 -1
View File
@@ -860,7 +860,7 @@ public class Zaken extends Quest
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", npc));
if (!npc.getSpawn().is_customBossInstance())
if (!npc.getSpawn().isCustomBossInstance())
{
GrandBossManager.getInstance().setBossStatus(ZAKEN, DEAD);
// time is 36hour +/- 17hour
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java
Vendored
+3 -3
View File
@@ -88,7 +88,7 @@ public class Monastery extends Quest
}
default:
{
npc.setIsRunning(true);
npc.setRunning(true);
((Attackable) npc).addDamageHate(player, 0, 999);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
break;
@@ -145,7 +145,7 @@ public class Monastery extends Quest
}
default:
{
npc.setIsRunning(true);
npc.setRunning(true);
((Attackable) npc).addDamageHate(target, 0, 999);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
break;
@@ -164,7 +164,7 @@ public class Monastery extends Quest
{
if (Util.contains(MOBS_1, npc.getNpcId()) && (skill.getId() == 4589))
{
npc.setIsRunning(true);
npc.setRunning(true);
((Attackable) npc).addDamageHate(player, 0, 999);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java
Vendored
+2 -2
View File
@@ -53,7 +53,7 @@ public class RetreatOnAttack extends Quest
{
if (event.equals("Retreat") && (npc != null) && (player != null))
{
npc.setIsAfraid(false);
npc.setAfraid(false);
((Attackable) npc).addDamageHate(player, 0, 100);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
}
@@ -85,7 +85,7 @@ public class RetreatOnAttack extends Quest
}
posX = posX + signX;
posY = posY + signY;
npc.setIsAfraid(true);
npc.setAfraid(true);
npc.setRunning();
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(posX, posY, posZ));
startQuestTimer("Retreat", 10000, npc, attacker);
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java
Vendored
+1 -1
View File
@@ -446,7 +446,7 @@ public class Q216_TrialOfTheGuildsman extends Quest
if (st.hasQuestItems(PINTER_INSTRUCTIONS))
{
// Different cases if player is a wannabe BH or WS.
if (st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getIsSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && Rnd.nextBoolean())
if (st.dropItemsAlways(AMBER_BEAD, ((player.getClassId() == ClassId.SCAVENGER) && (npc.getSpoiledBy() == player.getObjectId())) ? 10 : 5, 70) && (player.getClassId() == ClassId.ARTISAN) && Rnd.nextBoolean())
{
st.giveItems(AMBER_LUMP, 1);
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java
Vendored
+2 -2
View File
@@ -474,7 +474,7 @@ public class Q417_PathToBecomeAScavenger extends Quest
break;
case HONEY_BEAR:
if ((st.getInt("cond") == 5) && (npc.getIsSpoiledBy() == player.getObjectId()) && st.dropItemsAlways(HONEY_JAR, 1, 5))
if ((st.getInt("cond") == 5) && (npc.getSpoiledBy() == player.getObjectId()) && st.dropItemsAlways(HONEY_JAR, 1, 5))
{
st.set("cond", "6");
}
@@ -482,7 +482,7 @@ public class Q417_PathToBecomeAScavenger extends Quest
case HUNTER_TARANTULA:
case PLUNDER_TARANTULA:
if ((st.getInt("cond") == 7) && (npc.getIsSpoiledBy() == player.getObjectId()) && st.dropItems(BEAD, 1, 20, (npc.getNpcId() == HUNTER_TARANTULA) ? 333333 : 600000))
if ((st.getInt("cond") == 7) && (npc.getSpoiledBy() == player.getObjectId()) && st.dropItems(BEAD, 1, 20, (npc.getNpcId() == HUNTER_TARANTULA) ? 333333 : 600000))
{
st.set("cond", "8");
}
L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java
Vendored
+5 -5
View File
@@ -266,7 +266,7 @@ public class OracleTeleport extends Quest
{
final Location loc = RETURN_LOCS[st.getInt("id")];
player.teleToLocation(loc.getX(), loc.getY(), loc.getZ());
player.setIsIn7sDungeon(false);
player.setIn7sDungeon(false);
st.exitQuest(true);
}
else if (Util.contains(RIFT_POSTERS, npcId) && (st.getState() == State.STARTED))
@@ -283,12 +283,12 @@ public class OracleTeleport extends Quest
if (Util.contains(TOWN_DAWN, id))
{
player.teleToLocation(-80157, 111344, -4901);
player.setIsIn7sDungeon(true);
player.setIn7sDungeon(true);
}
else if (Util.contains(TOWN_DUSK, id))
{
player.teleToLocation(-81261, 86531, -5157);
player.setIsIn7sDungeon(true);
player.setIn7sDungeon(true);
}
else
{
@@ -400,7 +400,7 @@ public class OracleTeleport extends Quest
st.set("id", Integer.toString(i));
st.playSound(QuestState.SOUND_ACCEPT);
player.teleToLocation(-80157, 111344, -4901);
player.setIsIn7sDungeon(true);
player.setIn7sDungeon(true);
}
if (Util.contains(TOWN_DUSK, npcId))
@@ -420,7 +420,7 @@ public class OracleTeleport extends Quest
st.set("id", Integer.toString(i));
st.playSound(QuestState.SOUND_ACCEPT);
player.teleToLocation(-81261, 86531, -5157);
player.setIsIn7sDungeon(true);
player.setIn7sDungeon(true);
}
else if ((npcId >= 31494) && (npcId <= 31507))
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java
+7 -7
View File
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
import org.l2jmobius.gameserver.network.serverpackets.ItemList;
@@ -204,7 +204,7 @@ public class RecipeController
_skillLevel = _player.getSkillLevel(_skillId);
_skill = _player.getKnownSkill(_skillId);
_player.setIsCrafting(true);
_player.setCrafting(true);
if (_player.isAlikeDead())
{
@@ -314,7 +314,7 @@ public class RecipeController
updateCurMp();
updateCurLoad();
_player.setIsCrafting(false);
_player.setCrafting(false);
_isValid = true;
}
@@ -459,7 +459,7 @@ public class RecipeController
updateCurMp();
updateCurLoad();
_activeMakers.remove(_player);
_player.setIsCrafting(false);
_player.setCrafting(false);
_target.sendPacket(new ItemList(_target, false));
}
@@ -594,7 +594,7 @@ public class RecipeController
private void abort()
{
updateMakeInfo(false);
_player.setIsCrafting(false);
_player.setCrafting(false);
_activeMakers.remove(_player);
}
@@ -712,7 +712,7 @@ public class RecipeController
// you can use ALT_GAME_CREATION_XP_RATE/SP to
// modify XP/SP gained (default = 1)
_player.addExpAndSp((int) _player.calcStat(Stats.EXPSP_RATE, exp * Config.ALT_GAME_CREATION_XP_RATE * Config.ALT_GAME_CREATION_SPEED, null, null), (int) _player.calcStat(Stats.EXPSP_RATE, sp * Config.ALT_GAME_CREATION_SP_RATE * Config.ALT_GAME_CREATION_SPEED, null, null));
_player.addExpAndSp((int) _player.calcStat(Stat.EXPSP_RATE, exp * Config.ALT_GAME_CREATION_XP_RATE * Config.ALT_GAME_CREATION_SPEED, null, null), (int) _player.calcStat(Stat.EXPSP_RATE, sp * Config.ALT_GAME_CREATION_SP_RATE * Config.ALT_GAME_CREATION_SPEED, null, null));
}
updateMakeInfo(true); // success
}
@@ -725,7 +725,7 @@ public class RecipeController
if ((recipeList == null) || (recipeList.getRecipes().length == 0))
{
player.sendMessage("No recipe for: " + id);
player.setIsCrafting(false);
player.setCrafting(false);
return null;
}
return recipeList;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+2 -2
View File
@@ -592,14 +592,14 @@ public class AttackableAI extends CreatureAI
if (distance2 > (Config.MAX_DRIFT_RANGE * Config.MAX_DRIFT_RANGE))
{
npc.setisReturningToSpawnPoint(true);
npc.setReturningToSpawnPoint(true);
final float delay = (float) Math.sqrt(distance2) / Config.MAX_DRIFT_RANGE;
x1 = _actor.getX() + (int) ((x1 - _actor.getX()) / delay);
y1 = _actor.getY() + (int) ((y1 - _actor.getY()) / delay);
}
else
{
npc.setisReturningToSpawnPoint(false);
npc.setReturningToSpawnPoint(false);
}
}
else
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java
+1 -1
View File
@@ -422,7 +422,7 @@ public class CreatureAI extends AbstractAI
return;
}
if (_actor.isImobilised() || _actor.isRooted())
if (_actor.isImmobilized() || _actor.isRooted())
{
// Cancel action client side by sending Server->Client packet ActionFailed to the PlayerInstance actor
clientActionFailed();
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
@Override
public void changeIntention(CtrlIntention intention, Object arg0, Object arg1)
{
((Attackable) _actor).setisReturningToSpawnPoint(false);
((Attackable) _actor).setReturningToSpawnPoint(false);
if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/OfflineTradeTable.java
+1 -1
View File
@@ -265,7 +265,7 @@ public class OfflineTradeTable
player.sitDown();
if (Config.OFFLINE_MODE_SET_INVULNERABLE)
{
player.setIsInvul(true);
player.setInvul(true);
}
if (Config.OFFLINE_SET_NAME_COLOR)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/csv/MapRegionTable.java
+4 -4
View File
@@ -522,13 +522,13 @@ public class MapRegionTable
{
// If Teleporting to castle or
// If is on caslte with siege and player's clan is defender
if ((teleportWhere == TeleportWhereType.Castle) || ((teleportWhere == TeleportWhereType.Castle) && castle.getSiege().getIsInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
if ((teleportWhere == TeleportWhereType.Castle) || ((teleportWhere == TeleportWhereType.Castle) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null)))
{
coord = castle.getZone().getSpawn();
return new Location(coord[0], coord[1], coord[2]);
}
if ((teleportWhere == TeleportWhereType.SiegeFlag) && castle.getSiege().getIsInProgress())
if ((teleportWhere == TeleportWhereType.SiegeFlag) && castle.getSiege().isInProgress())
{
// Check if player's clan is attacker
final List<NpcInstance> flags = castle.getSiege().getFlag(player.getClan());
@@ -545,13 +545,13 @@ public class MapRegionTable
{
// teleporting to castle or fortress
// is on caslte with siege and player's clan is defender
if ((teleportWhere == TeleportWhereType.Fortress) || ((teleportWhere == TeleportWhereType.Fortress) && fort.getSiege().getIsInProgress() && (fort.getSiege().getDefenderClan(player.getClan()) != null)))
if ((teleportWhere == TeleportWhereType.Fortress) || ((teleportWhere == TeleportWhereType.Fortress) && fort.getSiege().isInProgress() && (fort.getSiege().getDefenderClan(player.getClan()) != null)))
{
coord = fort.getZone().getSpawn();
return new Location(coord[0], coord[1], coord[2]);
}
if ((teleportWhere == TeleportWhereType.SiegeFlag) && fort.getSiege().getIsInProgress())
if ((teleportWhere == TeleportWhereType.SiegeFlag) && fort.getSiege().isInProgress())
{
// check if player's clan is attacker
final List<NpcInstance> flags = fort.getSiege().getFlag(player.getClan());
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java
+11 -11
View File
@@ -36,8 +36,8 @@ import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.base.ClassId;
import org.l2jmobius.gameserver.model.skills.BaseStats;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Stat;
/**
* @version $Revision: 1.8.2.6.2.9 $ $Date: 2005/04/06 16:13:25 $
@@ -504,12 +504,12 @@ public class NpcTable
npcDat.set("baseRunSpd", npcData.getInt("runspd"));
// constants, until we have stats in DB
npcDat.safeSet("baseSTR", npcData.getInt("str"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseCON", npcData.getInt("con"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseDEX", npcData.getInt("dex"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseINT", npcData.getInt("int"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseWIT", npcData.getInt("wit"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseMEN", npcData.getInt("men"), 0, BaseStats.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseSTR", npcData.getInt("str"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseCON", npcData.getInt("con"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseDEX", npcData.getInt("dex"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseINT", npcData.getInt("int"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseWIT", npcData.getInt("wit"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.safeSet("baseMEN", npcData.getInt("men"), 0, BaseStat.MAX_STAT_VALUE, "Loading npc template id: " + npcData.getInt("idTemplate"));
npcDat.set("baseCpMax", 0);
@@ -522,9 +522,9 @@ public class NpcTable
npcDat.set("absorb_type", npcData.getString("absorb_type"));
final NpcTemplate template = new NpcTemplate(npcDat, custom);
template.addVulnerability(Stats.BOW_WPN_VULN, 1);
template.addVulnerability(Stats.BLUNT_WPN_VULN, 1);
template.addVulnerability(Stats.DAGGER_WPN_VULN, 1);
template.addVulnerability(Stat.BOW_WPN_VULN, 1);
template.addVulnerability(Stat.BLUNT_WPN_VULN, 1);
template.addVulnerability(Stat.DAGGER_WPN_VULN, 1);
_npcs.put(id, template);
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/TeleportLocationTable.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class TeleportLocationTable
teleport.setY(rset.getInt("loc_y"));
teleport.setZ(rset.getInt("loc_z"));
teleport.setPrice(rset.getInt("price"));
teleport.setIsForNoble(rset.getInt("fornoble") == 1);
teleport.setForNoble(rset.getInt("fornoble") == 1);
_teleports.put(teleport.getTeleId(), teleport);
}
@@ -93,7 +93,7 @@ public class TeleportLocationTable
teleport.setY(rset.getInt("loc_y"));
teleport.setZ(rset.getInt("loc_z"));
teleport.setPrice(rset.getInt("price"));
teleport.setIsForNoble(rset.getInt("fornoble") == 1);
teleport.setForNoble(rset.getInt("fornoble") == 1);
_teleports.put(teleport.getTeleId(), teleport);
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
+2 -3
View File
@@ -339,14 +339,13 @@ public class AdminData implements IXmlReader
public boolean isGmOnline(boolean includeHidden)
{
for (boolean b : _gmList.values())
for (boolean value : _gmList.values())
{
if (includeHidden || !b)
if (includeHidden || !value)
{
return true;
}
}
return false;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java
+13 -13
View File
@@ -36,7 +36,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.model.Augmentation;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
/**
* This class manages the augmentation data and can also create new augmentations.
@@ -260,7 +260,7 @@ public class AugmentationData
}
// store this stat
_augmentationStats[(i - 1)].add(new augmentationStat(Stats.valueOfXml(statName), soloValues, combinedValues));
_augmentationStats[(i - 1)].add(new augmentationStat(Stat.valueOfXml(statName), soloValues, combinedValues));
}
}
}
@@ -452,16 +452,16 @@ public class AugmentationData
public class AugStat
{
private final Stats _stat;
private final Stat _stat;
private final float _value;
public AugStat(Stats stat, float value)
public AugStat(Stat stat, float value)
{
_stat = stat;
_value = value;
}
public Stats getStat()
public Stat getStat()
{
return _stat;
}
@@ -546,7 +546,7 @@ public class AugmentationData
// get 2nd stat
as = _augmentationStats[block].get(rescales + stats[i]);
if (as.getStat() == Stats.CRITICAL_DAMAGE)
if (as.getStat() == Stat.CRITICAL_DAMAGE)
{
temp.add(new AugStat(as.getStat(), as.getCombinedStatValue(subblock)));
}
@@ -563,22 +563,22 @@ public class AugmentationData
{
case BASESTAT_STR:
{
temp.add(new AugStat(Stats.STAT_STR, 1.0f));
temp.add(new AugStat(Stat.STAT_STR, 1.0f));
break;
}
case BASESTAT_CON:
{
temp.add(new AugStat(Stats.STAT_CON, 1.0f));
temp.add(new AugStat(Stat.STAT_CON, 1.0f));
break;
}
case BASESTAT_INT:
{
temp.add(new AugStat(Stats.STAT_INT, 1.0f));
temp.add(new AugStat(Stat.STAT_INT, 1.0f));
break;
}
case BASESTAT_MEN:
{
temp.add(new AugStat(Stats.STAT_MEN, 1.0f));
temp.add(new AugStat(Stat.STAT_MEN, 1.0f));
break;
}
}
@@ -619,13 +619,13 @@ public class AugmentationData
public class augmentationStat
{
private final Stats _stat;
private final Stat _stat;
private final int _singleSize;
private final int _combinedSize;
private final float[] _singleValues;
private final float[] _combinedValues;
public augmentationStat(Stats stat, float[] sValues, float[] cValues)
public augmentationStat(Stat stat, float[] sValues, float[] cValues)
{
_stat = stat;
_singleSize = sValues.length;
@@ -664,7 +664,7 @@ public class AugmentationData
return _combinedValues[i];
}
public Stats getStat()
public Stat getStat()
{
return _stat;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java
+7 -7
View File
@@ -42,7 +42,7 @@ import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.type.ArmorType;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.Env;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.model.skills.conditions.Condition;
import org.l2jmobius.gameserver.model.skills.conditions.ConditionElementSeed;
import org.l2jmobius.gameserver.model.skills.conditions.ConditionForceBuff;
@@ -207,7 +207,7 @@ public abstract class DocumentBase
protected void attachFunc(Node n, Object template, String name, Condition attachCond)
{
final Stats stat = Stats.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue());
final Stat stat = Stat.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue());
final String order = n.getAttributes().getNamedItem("order").getNodeValue();
final Lambda lambda = getLambda(n, template);
final int ord = Integer.decode(getValue(order, template));
@@ -752,7 +752,7 @@ public abstract class DocumentBase
protected Condition parseSkillCondition(Node n)
{
final NamedNodeMap attrs = n.getAttributes();
final Stats stat = Stats.valueOfXml(attrs.getNamedItem("stat").getNodeValue());
final Stat stat = Stat.valueOfXml(attrs.getNamedItem("stat").getNodeValue());
return new ConditionSkillStats(stat);
}
@@ -902,22 +902,22 @@ public abstract class DocumentBase
{
if (val.equalsIgnoreCase("$player_level"))
{
return new LambdaStats(LambdaStats.StatsType.PLAYER_LEVEL);
return new LambdaStats(LambdaStats.StatType.PLAYER_LEVEL);
}
if (val.equalsIgnoreCase("$target_level"))
{
return new LambdaStats(LambdaStats.StatsType.TARGET_LEVEL);
return new LambdaStats(LambdaStats.StatType.TARGET_LEVEL);
}
if (val.equalsIgnoreCase("$player_max_hp"))
{
return new LambdaStats(LambdaStats.StatsType.PLAYER_MAX_HP);
return new LambdaStats(LambdaStats.StatType.PLAYER_MAX_HP);
}
if (val.equalsIgnoreCase("$player_max_mp"))
{
return new LambdaStats(LambdaStats.StatsType.PLAYER_MAX_MP);
return new LambdaStats(LambdaStats.StatType.PLAYER_MAX_MP);
}
// try to find value out of item fields
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminCTFEngine.java
+10 -10
View File
@@ -203,7 +203,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Min lvl must be lower then Max");
return false;
}
if (CTF.set_minlvl(lvl))
if (CTF.setMinLvl(lvl))
{
showMainPage(activeChar);
return true;
@@ -234,7 +234,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Cannot perform requested operation, Max lvl must be higher then Min");
return false;
}
if (CTF.setMaxlvl(lvl))
if (CTF.setMaxLvl(lvl))
{
showMainPage(activeChar);
return true;
@@ -336,7 +336,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward <reward_id>");
return false;
}
if (CTF.set_rewardId(id))
if (CTF.setRewardId(id))
{
showMainPage(activeChar);
return true;
@@ -361,7 +361,7 @@ public class AdminCTFEngine implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "Usage: //ctf_reward_amount <reward_amount>");
return false;
}
if (CTF.set_rewardAmount(amount))
if (CTF.setRewardAmount(amount))
{
showMainPage(activeChar);
return true;
@@ -754,18 +754,18 @@ public class AdminCTFEngine implements IAdminCommandHandler
replyMSG.append("Joining NPC ID:&nbsp;<font color=\"00FF00\">" + CTF.getNpcId() + " on pos " + npcLoc.getX() + "," + npcLoc.getY() + "," + npcLoc.getZ() + "</font><br1>");
replyMSG.append("<button value=\"Tele->NPC\" action=\"bypass -h admin_ctf_tele_npc\" width=90 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"><br>");
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.get_rewardId() + "</font><br1>");
if (ItemTable.getInstance().getTemplate(CTF.get_rewardId()) != null)
replyMSG.append("Reward ID:&nbsp;<font color=\"00FF00\">" + CTF.getRewardId() + "</font><br1>");
if (ItemTable.getInstance().getTemplate(CTF.getRewardId()) != null)
{
replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">" + ItemTable.getInstance().getTemplate(CTF.get_rewardId()).getName() + "</font><br1>");
replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">" + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + "</font><br1>");
}
else
{
replyMSG.append("Reward Item:&nbsp;<font color=\"00FF00\">(unknown)</font><br1>");
}
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + CTF.get_rewardAmount() + "</font><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.get_minlvl() + "</font><br1>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxlvl() + "</font><br><br>");
replyMSG.append("Reward Amount:&nbsp;<font color=\"00FF00\">" + CTF.getRewardAmount() + "</font><br>");
replyMSG.append("Min lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMinLvl() + "</font><br1>");
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + CTF.getMaxLvl() + "</font><br><br>");
replyMSG.append("Min Players:&nbsp;<font color=\"00FF00\">" + CTF.getMinPlayers() + "</font><br1>");
replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + CTF.getMaxPlayers() + "</font><br>");
replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + CTF.getJoinTime() + "</font><br1>");
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDMEngine.java
+3 -3
View File
@@ -306,18 +306,18 @@ public class AdminDMEngine implements IAdminCommandHandler
replyMSG.append("Max lvl:&nbsp;<font color=\"00FF00\">" + DM.getMaxlvl() + "</font><br><br>");
replyMSG.append("Death Match Color:&nbsp;<font color=\"00FF00\">" + DM.getPlayerColors() + "</font><br>");
final Location playerLoc = DM.get_playersSpawnLocation();
final Location playerLoc = DM.getPlayersSpawnLocation();
replyMSG.append("Death Match Spawn Pos:&nbsp;<font color=\"00FF00\">" + playerLoc.getX() + "," + playerLoc.getY() + "," + playerLoc.getZ() + "</font><br><br>");
replyMSG.append("Current players:<br1>");
if (!DM.is_started())
if (!DM.hasStarted())
{
replyMSG.append("<br1>");
replyMSG.append(DM._players.size() + " players participating.");
replyMSG.append("<br><br>");
}
else if (DM.is_started())
else if (DM.hasStarted())
{
replyMSG.append("<br1>");
replyMSG.append(DM._players.size() + " players in fighting event.");
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDelete.java
+2 -2
View File
@@ -70,14 +70,14 @@ public class AdminDelete implements IAdminCommandHandler
{
spawn.stopRespawn();
if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()) && !spawn.is_customBossInstance())
if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcId()) && !spawn.isCustomBossInstance())
{
RaidBossSpawnManager.getInstance().deleteSpawn(spawn, true);
}
else
{
boolean update = true;
if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()) && spawn.is_customBossInstance())
if (GrandBossManager.getInstance().isDefined(spawn.getNpcId()) && spawn.isCustomBossInstance())
{
update = false;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEffects.java
+4 -4
View File
@@ -243,7 +243,7 @@ public class AdminEffects implements IAdminCommandHandler
{
creature.startAbnormalEffect(0x0800);
}
creature.setIsParalyzed(true);
creature.setParalyzed(true);
final StopMove sm = new StopMove(creature);
creature.sendPacket(sm);
creature.broadcastPacket(sm);
@@ -263,7 +263,7 @@ public class AdminEffects implements IAdminCommandHandler
{
creature = (Creature) target;
creature.stopAbnormalEffect((short) 0x0400);
creature.setIsParalyzed(false);
creature.setParalyzed(false);
}
}
catch (Exception e)
@@ -279,7 +279,7 @@ public class AdminEffects implements IAdminCommandHandler
if (!player.isGM())
{
player.startAbnormalEffect(0x0400);
player.setIsParalyzed(true);
player.setParalyzed(true);
final StopMove sm = new StopMove(player);
player.sendPacket(sm);
player.broadcastPacket(sm);
@@ -297,7 +297,7 @@ public class AdminEffects implements IAdminCommandHandler
for (PlayerInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
player.stopAbnormalEffect(0x0400);
player.setIsParalyzed(false);
player.setParalyzed(false);
}
}
catch (Exception e)
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminInvul.java
+2 -2
View File
@@ -72,12 +72,12 @@ public class AdminInvul implements IAdminCommandHandler
String text;
if (activeChar.isInvul())
{
activeChar.setIsInvul(false);
activeChar.setInvul(false);
text = activeChar.getName() + " is now mortal.";
}
else
{
activeChar.setIsInvul(true);
activeChar.setInvul(true);
text = activeChar.getName() + " is now invulnerable.";
}
BuilderUtil.sendSysMessage(activeChar, text);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
+2 -2
View File
@@ -439,7 +439,7 @@ public class AdminSkill implements IAdminCommandHandler
showMainPage(activeChar);
}
private void adminAddSkill(PlayerInstance activeChar, String val)
private void adminAddSkill(PlayerInstance activeChar, String value)
{
final WorldObject target = activeChar.getTarget();
PlayerInstance player = null;
@@ -464,7 +464,7 @@ public class AdminSkill implements IAdminCommandHandler
return;
}
final StringTokenizer st = new StringTokenizer(val);
final StringTokenizer st = new StringTokenizer(value);
if (st.countTokens() != 2)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
+1 -1
View File
@@ -314,7 +314,7 @@ public class AdminSpawn implements IAdminCommandHandler
BuilderUtil.sendSysMessage(activeChar, "It will be spawned but not saved on Database");
BuilderUtil.sendSysMessage(activeChar, "After server restart or raid dead, the spawned npc will desappear");
permanent = false;
spawn.set_customBossInstance(true); // for raids, this value is used in order to segnalate to not save respawn time - status for custom instance
spawn.setCustomBossInstance(true); // for raids, this value is used in order to segnalate to not save respawn time - status for custom instance
}
if (RaidBossSpawnManager.getInstance().getValidTemplate(spawn.getNpcId()) != null)
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
+1 -1
View File
@@ -611,7 +611,7 @@ public class AdminTeleport implements IAdminCommandHandler
}
final int respawnTime = spawn.getRespawnDelay() / 1000;
final boolean custom_boss_spawn = spawn.is_customBossInstance();
final boolean custom_boss_spawn = spawn.isCustomBossInstance();
target.deleteMe();
spawn.stopRespawn();
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTvTEngine.java
+1 -1
View File
@@ -437,7 +437,7 @@ public class AdminTvTEngine implements IAdminCommandHandler
replyMSG.append("Max Players:&nbsp;<font color=\"00FF00\">" + TvT.getMaxPlayers() + "</font><br><br>");
replyMSG.append("Joining Time:&nbsp;<font color=\"00FF00\">" + TvT.getJoinTime() + "</font><br>");
replyMSG.append("Event Timer:&nbsp;<font color=\"00FF00\">" + TvT.getEventTime() + "</font><br><br>");
replyMSG.append("Interval Time:&nbsp;<font color=\"00FF00\">" + TvT.get_intervalBetweenMatches() + "</font><br><br>");
replyMSG.append("Interval Time:&nbsp;<font color=\"00FF00\">" + TvT.getIntervalBetweenMatches() + "</font><br><br>");
replyMSG.append("Current teams:<br1>");
replyMSG.append("<center><table border=\"0\">");
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/MercTicket.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class MercTicket implements IItemHandler
return;
}
if ((castle == null) || castle.getSiege().getIsInProgress())
if ((castle == null) || castle.getSiege().isInProgress())
{
player.sendMessage("You cannot hire mercenary while siege is in progress!");
return;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
+1 -1
View File
@@ -215,7 +215,7 @@ public class Potions implements IItemHandler
return;
}
if (activeChar._inEventDM && DM.is_started() && !Config.DM_ALLOW_POTIONS)
if (activeChar._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_POTIONS)
{
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
return;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Remedy.java
+1 -1
View File
@@ -137,7 +137,7 @@ public class Remedy implements IItemHandler
}
}
player.setIsImobilised(false);
player.setImmobilized(false);
if (player.getFirstEffect(Effect.EffectType.ROOT) == null)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
+2 -2
View File
@@ -109,7 +109,7 @@ public class ScrollOfEscape implements IItemHandler
return;
}
if (player._inEventDM && DM.is_started())
if (player._inEventDM && DM.hasStarted())
{
player.sendMessage("You can't use Scroll of Escape in DM.");
return;
@@ -229,7 +229,7 @@ public class ScrollOfEscape implements IItemHandler
_player.enableAllSkills();
_player.setIsIn7sDungeon(false);
_player.setIn7sDungeon(false);
try
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class ScrollOfResurrection implements IItemHandler
castle = CastleManager.getInstance().getCastle(targetPet.getX(), targetPet.getY(), targetPet.getZ());
}
if ((castle != null) && castle.getSiege().getIsInProgress())
if ((castle != null) && castle.getSiege().isInProgress())
{
condGood = false;
player.sendPacket(SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
+2 -2
View File
@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.Weapon;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.ExAutoSoulShot;
import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;
@@ -97,7 +97,7 @@ public class SoulShots implements IItemHandler
}
// Consume Soulshots if player has enough of them
final int saSSCount = (int) player.getStat().calcStat(Stats.SOULSHOT_COUNT, 0, null, null);
final int saSSCount = (int) player.getStat().calcStat(Stat.SOULSHOT_COUNT, 0, null, null);
final int SSCount = saSSCount == 0 ? weaponItem.getSoulShotCount() : saSSCount;
if (!Config.DONT_DESTROY_SS && !player.destroyItemWithoutTrace("Consume", item.getObjectId(), SSCount, null, false))
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class SummonItems implements IItemHandler
return;
}
if (player._inEventDM && DM.is_started() && !Config.DM_ALLOW_SUMMON)
if (player._inEventDM && DM.hasStarted() && !Config.DM_ALLOW_SUMMON)
{
final ActionFailed af = ActionFailed.STATIC_PACKET;
player.sendPacket(af);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java
+5 -5
View File
@@ -30,9 +30,9 @@ import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.BaseStats;
import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.PlaySound;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -147,7 +147,7 @@ public class Blow implements ISkillHandler
{
crit = true; // if there is not critical condition, calculate critical chance
}
else if (Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.DEX.calcBonus(creature)))
else if (Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStat.DEX.calcBonus(creature)))
{
crit = true;
}
@@ -172,7 +172,7 @@ public class Blow implements ISkillHandler
final Summon summon = player.getPet();
if ((summon instanceof SummonInstance) && Util.checkIfInRange(900, player, summon, true))
{
int tDmg = ((int) damage * (int) player.getStat().calcStat(Stats.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
int tDmg = ((int) damage * (int) player.getStat().calcStat(Stat.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
// Only transfer dmg up to current HP, it should not be killed
if (summon.getCurrentHp() < tDmg)
@@ -199,7 +199,7 @@ public class Blow implements ISkillHandler
player.abortAttack();
player.abortCast();
player.getStatus().stopHpMpRegeneration();
// player.setIsDead(true);
// player.setDead(true);
player.setIsPendingRevive(true);
if (player.getPet() != null)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class ClanGate implements ISkillHandler
ThreadPool.schedule(new RemoveClanGate(castle.getCastleId(), player), skill.getTotalLifeTime());
castle.createClanGate(player.getX(), player.getY(), player.getZ() + 20);
player.getClan().broadcastToOnlineMembers(new SystemMessage(SystemMessageId.COURT_MAGICIAN_CREATED_PORTAL));
player.setIsParalyzed(true);
player.setParalyzed(true);
}
}
@@ -96,7 +96,7 @@ public class ClanGate implements ISkillHandler
{
if (player != null)
{
player.setIsParalyzed(false);
player.setParalyzed(false);
}
CastleManager.getInstance().getCastleById(castle).destroyClanGate();
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java
+6 -6
View File
@@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance;
import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -233,7 +233,7 @@ public class Disablers implements ISkillHandler
if (target instanceof Attackable)
{
skill.getEffects(creature, target, ss, sps, bss);
final double aggdiff = ((Attackable) target).getHating(creature) - target.calcStat(Stats.AGGRESSION, ((Attackable) target).getHating(creature), target, skill);
final double aggdiff = ((Attackable) target).getHating(creature) - target.calcStat(Stat.AGGRESSION, ((Attackable) target).getHating(creature), target, skill);
if (skill.getPower() > 0)
{
((Attackable) target).reduceHate(null, (int) skill.getPower());
@@ -441,7 +441,7 @@ public class Disablers implements ISkillHandler
{
landrate = 90 - (4 * (target.getLevel() - lvlmodifier));
}
landrate = (int) target.calcStat(Stats.CANCEL_VULN, landrate, target, null);
landrate = (int) target.calcStat(Stat.CANCEL_VULN, landrate, target, null);
if (Rnd.get(100) < landrate)
{
final Effect[] effects = target.getAllEffects();
@@ -506,7 +506,7 @@ public class Disablers implements ISkillHandler
}
int landrate = (int) skill.getPower();
landrate = (int) target.calcStat(Stats.CANCEL_VULN, landrate, target, null);
landrate = (int) target.calcStat(Stat.CANCEL_VULN, landrate, target, null);
if (Rnd.get(100) < landrate)
{
final Effect[] effects = target.getAllEffects();
@@ -594,7 +594,7 @@ public class Disablers implements ISkillHandler
{
landrate = 90 - (4 * (target.getLevel() - lvlmodifier));
}
landrate = (int) target.calcStat(Stats.CANCEL_VULN, landrate, target, null);
landrate = (int) target.calcStat(Stat.CANCEL_VULN, landrate, target, null);
if (Rnd.get(100) < landrate)
{
negateEffect(target, SkillType.BUFF, -1);
@@ -697,7 +697,7 @@ public class Disablers implements ISkillHandler
{
landrate = 90 - (4 * (target.getLevel() - lvlmodifier));
}
landrate = (int) target.calcStat(Stats.CANCEL_VULN, landrate, target, null);
landrate = (int) target.calcStat(Stat.CANCEL_VULN, landrate, target, null);
if (Rnd.get(100) < landrate)
{
target.stopEffects(effectType);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Heal.java
+2 -2
View File
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -138,7 +138,7 @@ public class Heal implements ISkillHandler
}
else if (skill.getSkillType() != SkillType.HEAL_PERCENT)
{
hp *= target.calcStat(Stats.HEAL_EFFECTIVNESS, 100, null, null) / 100;
hp *= target.calcStat(Stat.HEAL_EFFECTIVNESS, 100, null, null) / 100;
}
target.setCurrentHp(hp + target.getCurrentHp());
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ManaHeal.java
+2 -2
View File
@@ -22,7 +22,7 @@ import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -53,7 +53,7 @@ public class ManaHeal implements ISkillHandler
}
else
{
mp = (skill.getSkillType() == SkillType.MANARECHARGE) ? target.calcStat(Stats.RECHARGE_MP_RATE, mp, null, null) : mp;
mp = (skill.getSkillType() == SkillType.MANARECHARGE) ? target.calcStat(Stat.RECHARGE_MP_RATE, mp, null, null) : mp;
}
target.setLastHealAmount((int) mp);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java
+2 -2
View File
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.WeaponType;
import org.l2jmobius.gameserver.model.skills.BaseStats;
import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
import org.l2jmobius.gameserver.network.SystemMessageId;
@@ -111,7 +111,7 @@ public class Pdam implements ISkillHandler
boolean crit = false;
if (skill.getBaseCritRate() > 0)
{
crit = Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.STR.calcBonus(creature));
crit = Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStat.STR.calcBonus(creature));
}
boolean soul = false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Recall.java
+1 -1
View File
@@ -93,7 +93,7 @@ public class Recall implements ISkillHandler
continue;
}
if ((targetChar._inEventCTF && CTF.isStarted()) || (targetChar._inEventTvT && TvT.isStarted()) || (targetChar._inEventDM && DM.is_started()) || (targetChar._inEventVIP && VIP._started))
if ((targetChar._inEventCTF && CTF.isStarted()) || (targetChar._inEventTvT && TvT.isStarted()) || (targetChar._inEventDM && DM.hasStarted()) || (targetChar._inEventVIP && VIP._started))
{
targetChar.sendMessage("You can't use escape skill in Event.");
continue;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SiegeFlag.java
+4 -4
View File
@@ -85,8 +85,8 @@ public class SiegeFlag implements ISkillHandler
if (skill.isAdvancedFlag())
{
flag.set_advanceFlag(true);
flag.set_advanceMultiplier(skill.getAdvancedMultiplier());
flag.setAdvanceFlag(true);
flag.setAdvanceMultiplier(skill.getAdvancedMultiplier());
}
flag.setTitle(player.getClan().getName());
@@ -152,7 +152,7 @@ public class SiegeFlag implements ISkillHandler
{
sm.addString("You must be on castle ground to place a flag");
}
else if (!castle.getSiege().getIsInProgress())
else if (!castle.getSiege().isInProgress())
{
sm.addString("You can only place a flag during a siege.");
}
@@ -198,7 +198,7 @@ public class SiegeFlag implements ISkillHandler
{
sm.addString("You must be on fort ground to place a flag");
}
else if (!fort.getSiege().getIsInProgress())
else if (!fort.getSiege().isInProgress())
{
sm.addString("You can only place a flag during a siege.");
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Spoil.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class Spoil implements ISkillHandler
if (spoil)
{
target.setSpoil(true);
target.setIsSpoiledBy(creature.getObjectId());
target.setSpoiledBy(creature.getObjectId());
creature.sendPacket(new SystemMessage(SystemMessageId.SPOIL_SUCCESS));
}
else
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/StrSiegeAssault.java
+2 -2
View File
@@ -192,7 +192,7 @@ public class StrSiegeAssault implements ISkillHandler
{
sm.addString("You must be on castle ground to use strider siege assault");
}
else if (!castle.getSiege().getIsInProgress())
else if (!castle.getSiege().isInProgress())
{
sm.addString("You can only use strider siege assault during a siege.");
}
@@ -231,7 +231,7 @@ public class StrSiegeAssault implements ISkillHandler
{
sm.addString("You must be on fort ground to use strider siege assault");
}
else if (!fort.getSiege().getIsInProgress())
else if (!fort.getSiege().isInProgress())
{
sm.addString("You can only use strider siege assault during a siege.");
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/SummonFriend.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class SummonFriend implements ISkillHandler
activePlayer.sendMessage("You cannot use this skill in Event.");
return;
}
if (activePlayer._inEventDM && DM.is_started())
if (activePlayer._inEventDM && DM.hasStarted())
{
activePlayer.sendMessage("You cannot use this skill in Event.");
return;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeCastle.java
+2 -2
View File
@@ -138,7 +138,7 @@ public class TakeCastle implements ISkillHandler
{
sm.addString("You can only use this skill on an artifact");
}
else if (!castle.getSiege().getIsInProgress())
else if (!castle.getSiege().isInProgress())
{
sm.addString("You can only use this skill during a siege.");
}
@@ -190,7 +190,7 @@ public class TakeCastle implements ISkillHandler
{
sm.addString("You can only use this skill on an flagpole");
}
else if (!fort.getSiege().getIsInProgress())
else if (!fort.getSiege().isInProgress())
{
sm.addString("You can only use this skill during a siege.");
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/TakeFort.java
+1 -1
View File
@@ -32,7 +32,7 @@ package org.l2jmobius.gameserver.handler.skillhandlers;
/*
* public static boolean checkIfOkToCastFlagDisplay(Creature creature, boolean isCheckOnly) { return checkIfOkToCastFlagDisplay(activeChar, FortManager.getInstance().getFort(activeChar), isCheckOnly); } public static boolean checkIfOkToCastFlagDisplay(Creature creature, Fort fort, boolean
* isCheckOnly) { if (activeChar == null || !(activeChar instanceof PlayerInstance)) return false; SystemMessage sm = new SystemMessage(SystemMessageId.S1_S2); PlayerInstance player = (PlayerInstance)activeChar; if (fort == null || fort.getFortId() <= 0)
* sm.addString("You must be on fort ground to use this skill"); else if (player.getTarget() == null && !(player.getTarget() instanceof ArtefactInstance)) sm.addString("You can only use this skill on an flagpole"); else if (!fort.getSiege().getIsInProgress())
* sm.addString("You must be on fort ground to use this skill"); else if (player.getTarget() == null && !(player.getTarget() instanceof ArtefactInstance)) sm.addString("You can only use this skill on an flagpole"); else if (!fort.getSiege().isInProgress())
* sm.addString("You can only use this skill during a siege."); else if (!Util.checkIfInRange(200, player, player.getTarget(), true)) sm.addString("You are not in range of the flagpole."); else if (fort.getSiege().getAttackerClan(player.getClan()) == null)
* sm.addString("You must be an attacker to use this skill"); else { if (!isCheckOnly) fort.getSiege().announceToPlayer("Clan " + player.getClan().getName() + " has begun to raise flag.", true); return true; } if (!isCheckOnly) { player.sendPacket(sm); } return false; } }
*/
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Escape.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class Escape implements IUserCommandHandler
}
// Check to see if the current player is in DM Event.
if (player._inEventDM && DM.is_started())
if (player._inEventDM && DM.hasStarted())
{
player.sendMessage("You may not use an escape skill in DM.");
return false;
@@ -171,7 +171,7 @@ public class Escape implements IUserCommandHandler
return;
}
_player.setIsIn7sDungeon(false);
_player.setIn7sDungeon(false);
_player.enableAllSkills();
try
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/AwayCmd.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class AwayCmd implements IVoicedCommandHandler
}
// Check if player is in Siege
if ((siege != null) && siege.getIsInProgress())
if ((siege != null) && siege.isInProgress())
{
activeChar.sendMessage("You are in siege, you can't go Afk.");
return false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/CTFCmd.java
+8 -8
View File
@@ -83,12 +83,12 @@ public class CTFCmd implements IVoicedCommandHandler
activeChar.sendMessage("You are not allowed to participate to the event because you are in Olympiad.");
return false;
}
else if (activeChar.getLevel() < CTF.get_minlvl())
else if (activeChar.getLevel() < CTF.getMinLvl())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too low.");
return false;
}
else if (activeChar.getLevel() > CTF.getMaxlvl())
else if (activeChar.getLevel() > CTF.getMaxLvl())
{
activeChar.sendMessage("You are not allowed to participate to the event because your level is too high.");
return false;
@@ -162,16 +162,16 @@ public class CTFCmd implements IVoicedCommandHandler
if (CTF._playersShuffle.size() == 1)
{
activeChar.sendMessage("There is " + CTF._playersShuffle.size() + " player participating in this event.");
activeChar.sendMessage("Reward: " + CTF.get_rewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.get_rewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.get_minlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxlvl() + ".");
activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLvl() + ".");
}
else
{
activeChar.sendMessage("There are " + CTF._playersShuffle.size() + " players participating in this event.");
activeChar.sendMessage("Reward: " + CTF.get_rewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.get_rewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.get_minlvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxlvl() + ".");
activeChar.sendMessage("Reward: " + CTF.getRewardAmount() + " " + ItemTable.getInstance().getTemplate(CTF.getRewardId()).getName() + " !");
activeChar.sendMessage("Player Min lvl: " + CTF.getMinLvl() + ".");
activeChar.sendMessage("Player Max lvl: " + CTF.getMaxLvl() + ".");
}
return true;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/DMCmd.java
+3 -3
View File
@@ -98,7 +98,7 @@ public class DMCmd implements IVoicedCommandHandler
activeChar.sendMessage("You are not allowed to participate to the event because you have Karma.");
return false;
}
else if (DM.isTeleport() || DM.is_started())
else if (DM.isTeleport() || DM.hasStarted())
{
activeChar.sendMessage("DeathMatch Event registration period is over. You can't register now.");
return false;
@@ -123,7 +123,7 @@ public class DMCmd implements IVoicedCommandHandler
activeChar.sendMessage("There is no DeathMatch Event in progress.");
return false;
}
else if ((DM.isTeleport() || DM.is_started()) && activeChar._inEventDM)
else if ((DM.isTeleport() || DM.hasStarted()) && activeChar._inEventDM)
{
activeChar.sendMessage("You can not leave now because DeathMatch event has started.");
return false;
@@ -152,7 +152,7 @@ public class DMCmd implements IVoicedCommandHandler
activeChar.sendMessage("There is no DeathMatch Event in progress.");
return false;
}
else if (DM.isTeleport() || DM.is_started())
else if (DM.isTeleport() || DM.hasStarted())
{
activeChar.sendMessage("I can't provide you this info. Command available only in joining period.");
return false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java
+2 -2
View File
@@ -116,7 +116,7 @@ public class FarmPvpCmd implements IVoicedCommandHandler
}
final SetupGauge sg = new SetupGauge(SetupGauge.BLUE, 15000);
activeChar.sendPacket(sg);
activeChar.setIsImobilised(true);
activeChar.setImmobilized(true);
ThreadPool.schedule(new teleportTask(activeChar, placex, placey, placez, message), 15000);
@@ -156,7 +156,7 @@ public class FarmPvpCmd implements IVoicedCommandHandler
_player.teleToLocation(_x, _y, _z);
_player.sendMessage(_message);
_player.setIsImobilised(false);
_player.setImmobilized(false);
}
}
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
+4 -4
View File
@@ -303,7 +303,7 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("Your partner is in the observation.");
return false;
}
else if ((partner.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(partner.getClan()) != null) && CastleManager.getInstance().getCastleByOwner(partner.getClan()).getSiege().getIsInProgress())
else if ((partner.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(partner.getClan()) != null) && CastleManager.getInstance().getCastleByOwner(partner.getClan()).getSiege().isInProgress())
{
activeChar.sendMessage("Your partner is in siege, you can't go to your partner.");
return false;
@@ -333,7 +333,7 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("You may not use go to love in CTF.");
return false;
}
if (activeChar._inEventDM && DM.is_started())
if (activeChar._inEventDM && DM.hasStarted())
{
activeChar.sendMessage("You may not use go to love in DM.");
return false;
@@ -353,7 +353,7 @@ public class Wedding implements IVoicedCommandHandler
activeChar.sendMessage("You are in the observation.");
return false;
}
else if ((activeChar.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(activeChar.getClan()) != null) && CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).getSiege().getIsInProgress())
else if ((activeChar.getClan() != null) && (CastleManager.getInstance().getCastleByOwner(activeChar.getClan()) != null) && CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).getSiege().isInProgress())
{
activeChar.sendMessage("You are in siege, you can't go to your partner.");
return false;
@@ -428,7 +428,7 @@ public class Wedding implements IVoicedCommandHandler
return;
}
_player.setIsIn7sDungeon(_to7sDungeon);
_player.setIn7sDungeon(_to7sDungeon);
_player.enableAllSkills();
try
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/AwayManager.java
+8 -8
View File
@@ -69,13 +69,13 @@ public class AwayManager
public void setAway(PlayerInstance player, String text)
{
player.set_awaying(true);
player.setAwaying(true);
player.broadcastPacket(new SocialAction(player.getObjectId(), 9));
player.sendMessage("Your status is Away in " + Config.AWAY_TIMER + " Sec.");
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
final SetupGauge sg = new SetupGauge(SetupGauge.BLUE, Config.AWAY_TIMER * 1000);
player.sendPacket(sg);
player.setIsImobilised(true);
player.setImmobilized(true);
ThreadPool.schedule(new setPlayerAwayTask(player, text), Config.AWAY_TIMER * 1000);
}
@@ -132,7 +132,7 @@ public class AwayManager
_player.abortAttack();
_player.abortCast();
_player.setTarget(null);
_player.setIsImobilised(false);
_player.setImmobilized(false);
if (!_player.isSitting())
{
_player.sitDown();
@@ -158,9 +158,9 @@ public class AwayManager
}
_player.broadcastUserInfo();
_player.setIsParalyzed(true);
_player.setIsAway(true);
_player.set_awaying(false);
_player.setParalyzed(true);
_player.setAway(true);
_player.setAwaying(false);
}
}
@@ -187,9 +187,9 @@ public class AwayManager
return;
}
_player.setIsParalyzed(false);
_player.setParalyzed(false);
_player.enableAllSkills();
_player.setIsAway(false);
_player.setAway(false);
if (rd.isSitForced())
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
+2 -2
View File
@@ -101,7 +101,7 @@ public class FortSiegeManager
{
sm.addString("You must be on fort ground to summon this");
}
else if (!fort.getSiege().getIsInProgress())
else if (!fort.getSiege().isInProgress())
{
sm.addString("You can only summon this during a siege.");
}
@@ -439,7 +439,7 @@ public class FortSiegeManager
{
for (Fort fort : FortManager.getInstance().getForts())
{
if (checkIsRegistered(clan, fort.getFortId()) && (fort.getSiege() != null) && fort.getSiege().getIsInProgress())
if (checkIsRegistered(clan, fort.getFortId()) && (fort.getSiege() != null) && fort.getSiege().isInProgress())
{
return true;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/MercTicketManager.java
+1 -1
View File
@@ -712,7 +712,7 @@ public class MercTicketManager
if (NPC_IDS[i] == npcId) // Find the index of the item used
{
// only handle tickets if a siege is not ongoing in this npc's castle
if ((castle != null) && !castle.getSiege().getIsInProgress())
if ((castle != null) && !castle.getSiege().isInProgress())
{
itemId = ITEM_IDS[i];
// create the ticket in the gameworld
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+2 -2
View File
@@ -39,7 +39,7 @@ import org.l2jmobius.gameserver.model.StatsSet;
import org.l2jmobius.gameserver.model.actor.instance.RaidBossInstance;
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
import org.l2jmobius.gameserver.model.entity.Announcements;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.model.spawn.Spawn;
/**
@@ -241,7 +241,7 @@ public class RaidBossSpawnManager
final RaidBossInstance raidboss = bossId == 25328 ? DayNightSpawnManager.getInstance().handleBoss(spawnDat) : (RaidBossInstance) spawnDat.doSpawn();
if (raidboss != null)
{
final double bonus = raidboss.getStat().calcStat(Stats.MAX_HP, 1, raidboss, null);
final double bonus = raidboss.getStat().calcStat(Stat.MAX_HP, 1, raidboss, null);
// if new spawn, the currentHp is equal to maxHP/bonus, so set it to max
if ((int) (bonus * currentHP) == raidboss.getMaxHp())
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
+12 -12
View File
@@ -67,8 +67,8 @@ public class SiegeManager
private int _siegeClanMinLevel = 4; // Changeable in siege.config
private int _siegeLength = 120; // Time in minute. Changeable in siege.config
private boolean _teleport_to_siege = false;
private boolean _teleport_to_siege_town = false;
private boolean _teleportToSiege = false;
private boolean _teleportToSiegeTown = false;
private SiegeManager()
{
@@ -103,7 +103,7 @@ public class SiegeManager
{
sm.addString("You must be on castle ground to summon this");
}
else if (!castle.getSiege().getIsInProgress())
else if (!castle.getSiege().isInProgress())
{
sm.addString("You can only summon this during a siege.");
}
@@ -129,7 +129,7 @@ public class SiegeManager
for (Castle castle : CastleManager.getInstance().getCastles())
{
if (checkIsRegistered(clan, castle.getCastleId()) && (castle.getSiege() != null) && castle.getSiege().getIsInProgress())
if (checkIsRegistered(clan, castle.getCastleId()) && (castle.getSiege() != null) && castle.getSiege().isInProgress())
{
return true;
}
@@ -208,8 +208,8 @@ public class SiegeManager
_siegeLength = Integer.decode(siegeSettings.getProperty("SiegeLength", "120"));
// Siege Teleports
_teleport_to_siege = Boolean.parseBoolean(siegeSettings.getProperty("AllowTeleportToSiege", "false"));
_teleport_to_siege_town = Boolean.parseBoolean(siegeSettings.getProperty("AllowTeleportToSiegeTown", "false"));
_teleportToSiege = Boolean.parseBoolean(siegeSettings.getProperty("AllowTeleportToSiege", "false"));
_teleportToSiegeTown = Boolean.parseBoolean(siegeSettings.getProperty("AllowTeleportToSiegeTown", "false"));
// Siege spawns settings
_controlTowerSpawnList = new HashMap<>();
@@ -384,19 +384,19 @@ public class SiegeManager
}
/**
* @return the _teleport_to_siege
* @return the _teleportToSiege
*/
public boolean is_teleport_to_siege_allowed()
public boolean isTeleportToSiegeAllowed()
{
return _teleport_to_siege;
return _teleportToSiege;
}
/**
* @return the _teleport_to_siege_town
* @return the _teleportToSiegeTown
*/
public boolean is_teleport_to_siege_town_allowed()
public boolean isTeleportToSiegeTownAllowed()
{
return _teleport_to_siege_town;
return _teleportToSiegeTown;
}
public class SiegeSpawn
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/TownManager.java
+2 -2
View File
@@ -234,7 +234,7 @@ public class TownManager
final Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex));
if (castle != null)
{
return castle.getSiege().getIsInProgress();
return castle.getSiege().isInProgress();
}
}
return false;
@@ -272,7 +272,7 @@ public class TownManager
final Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex));
if (castle != null)
{
return castle.getSiege().getIsInProgress();
return castle.getSiege().isInProgress();
}
}
return false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java
+3 -3
View File
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.datatables.SkillTable;
import org.l2jmobius.gameserver.datatables.xml.AugmentationData;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.model.skills.funcs.FuncAdd;
import org.l2jmobius.gameserver.model.skills.funcs.LambdaConst;
@@ -65,7 +65,7 @@ public class Augmentation
public class augmentationStatBonus
{
private final Stats[] _stats;
private final Stat[] _stats;
private final float[] _values;
private boolean _active;
@@ -74,7 +74,7 @@ public class Augmentation
_active = false;
final List<AugmentationData.AugStat> as = AugmentationData.getInstance().getAugStatsById(augmentationId);
_stats = new Stats[as.size()];
_stats = new Stat[as.size()];
_values = new float[as.size()];
int i = 0;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/BlockList.java
+2 -2
View File
@@ -152,9 +152,9 @@ public class BlockList
return blockList.isBlockAll() || blockList.isInBlockList(targetId);
}
private void setBlockAll(boolean state)
private void setBlockAll(boolean value)
{
_owner.setInRefusalMode(state);
_owner.setInRefusalMode(value);
}
public List<Integer> getBlockList()
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Effect.java
+1 -1
View File
@@ -679,7 +679,7 @@ public abstract class Effect
return _template.showIcon;
}
public EffectState get_state()
public EffectState getState()
{
return _state;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Inventory.java
+2 -2
View File
@@ -95,7 +95,7 @@ public abstract class Inventory extends ItemContainer
final PlayerInstance owner = (PlayerInstance) getOwner();
if (item.getItemId() == 6408)
{
owner.setIsWearingFormalWear(false);
owner.setWearingFormalWear(false);
}
}
@@ -112,7 +112,7 @@ public abstract class Inventory extends ItemContainer
// If player equip Formal Wear unequip weapons and abort cast/attack
if (item.getItemId() == 6408)
{
owner.setIsWearingFormalWear(true);
owner.setWearingFormalWear(true);
if (owner.isCastingNow())
{
owner.abortCast();
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/NpcWalkerNode.java
+14 -14
View File
@@ -33,9 +33,9 @@ public class NpcWalkerNode
private boolean _running;
public void setRunning(boolean val)
public void setRunning(boolean value)
{
_running = val;
_running = value;
}
public void setRouteId(int id)
@@ -48,34 +48,34 @@ public class NpcWalkerNode
_npcId = id;
}
public void setMovePoint(String val)
public void setMovePoint(String value)
{
_movePoint = val;
_movePoint = value;
}
public void setChatText(String val)
public void setChatText(String value)
{
_chatText = val;
_chatText = value;
}
public void setMoveX(int val)
public void setMoveX(int value)
{
_moveX = val;
_moveX = value;
}
public void setMoveY(int val)
public void setMoveY(int value)
{
_moveY = val;
_moveY = value;
}
public void setMoveZ(int val)
public void setMoveZ(int value)
{
_moveZ = val;
_moveZ = value;
}
public void setDelay(int val)
public void setDelay(int value)
{
_delay = val;
_delay = value;
}
public int getRouteId()
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Party.java
+5 -5
View File
@@ -38,7 +38,7 @@ import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoom;
import org.l2jmobius.gameserver.model.partymatching.PartyMatchRoomList;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
import org.l2jmobius.gameserver.network.serverpackets.ExCloseMPCC;
@@ -125,11 +125,11 @@ public class Party
/**
* set invitation process flag and store time for expiration happens when: player join party or player decline to join
* @param val
* @param value
*/
public void setPendingInvitation(boolean val)
public void setPendingInvitation(boolean value)
{
_pendingInvitation = val;
_pendingInvitation = value;
_pendingInviteTimeout = GameTimeController.getGameTicks() + (PlayerInstance.REQUEST_TIMEOUT * GameTimeController.TICKS_PER_SECOND);
}
@@ -765,7 +765,7 @@ public class Party
// Add the XP/SP points to the requested party member
if (!member.isDead())
{
member.addExpAndSp(Math.round(member.calcStat(Stats.EXPSP_RATE, xpReward * preCalculation, null, null)), (int) member.calcStat(Stats.EXPSP_RATE, spReward * preCalculation, null, null));
member.addExpAndSp(Math.round(member.calcStat(Stat.EXPSP_RATE, xpReward * preCalculation, null, null)), (int) member.calcStat(Stat.EXPSP_RATE, spReward * preCalculation, null, null));
}
}
else
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java
+10 -10
View File
@@ -49,10 +49,10 @@ import org.l2jmobius.gameserver.model.entity.event.CTF;
import org.l2jmobius.gameserver.model.entity.event.DM;
import org.l2jmobius.gameserver.model.entity.event.TvT;
import org.l2jmobius.gameserver.model.entity.siege.Siege;
import org.l2jmobius.gameserver.model.skills.BaseStats;
import org.l2jmobius.gameserver.model.skills.BaseStat;
import org.l2jmobius.gameserver.model.skills.Env;
import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.model.skills.conditions.Condition;
import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
import org.l2jmobius.gameserver.model.skills.effects.EffectTemplate;
@@ -454,11 +454,11 @@ public abstract class Skill
private final boolean _ispotion;
private final int _element;
private final BaseStats _saveVs;
private final BaseStat _saveVs;
private final boolean _isSuicideAttack;
private final Stats _stat;
private final Stat _stat;
private final int _condition;
private final int _conditionValue;
@@ -560,7 +560,7 @@ public abstract class Skill
_negateId = set.getInt("negateId", 0);
_magicLevel = set.getInt("magicLvl", SkillTreeTable.getInstance().getMinSkillLevel(_id, _level));
_levelDepend = set.getInt("lvlDepend", 0);
_stat = set.getEnum("stat", Stats.class, null);
_stat = set.getEnum("stat", Stat.class, null);
_skillType = set.getEnum("skillType", SkillType.class);
_effectType = set.getEnum("effectType", SkillType.class, null);
@@ -569,7 +569,7 @@ public abstract class Skill
_effectLvl = set.getInt("effectLevel", 0);
_element = set.getInt("element", 0);
_saveVs = set.getEnum("saveVs", BaseStats.class, null);
_saveVs = set.getEnum("saveVs", BaseStat.class, null);
_condition = set.getInt("condition", 0);
_conditionValue = set.getInt("conditionValue", 0);
@@ -735,7 +735,7 @@ public abstract class Skill
return _skillType == SkillType.SIGNET_CASTTIME;
}
public BaseStats getSavevs()
public BaseStat getSavevs()
{
return _saveVs;
}
@@ -932,7 +932,7 @@ public abstract class Skill
/**
* @return the skill type (ex : BLEED, SLEEP, WATER...).
*/
public Stats getStat()
public Stat getStat()
{
return _stat;
}
@@ -2046,7 +2046,7 @@ public abstract class Skill
continue;
}
// check if allow interference is allowed if player is not on event but target is on event
if (((TvT.isStarted() && !Config.TVT_ALLOW_INTERFERENCE) || (CTF.isStarted() && !Config.CTF_ALLOW_INTERFERENCE) || (DM.is_started() && !Config.DM_ALLOW_INTERFERENCE))/* && !player.isGM() */)
if (((TvT.isStarted() && !Config.TVT_ALLOW_INTERFERENCE) || (CTF.isStarted() && !Config.CTF_ALLOW_INTERFERENCE) || (DM.hasStarted() && !Config.DM_ALLOW_INTERFERENCE))/* && !player.isGM() */)
{
if ((partyMember._inEventTvT && !player._inEventTvT) || (!partyMember._inEventTvT && player._inEventTvT))
{
@@ -2302,7 +2302,7 @@ public abstract class Skill
{
// check target is not in a active siege zone
final Siege siege = SiegeManager.getInstance().getSiege(newTarget);
if ((siege != null) && siege.getIsInProgress())
if ((siege != null) && siege.isInProgress())
{
continue;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TeleportLocation.java
+4 -4
View File
@@ -69,11 +69,11 @@ public class TeleportLocation
}
/**
* @param val
* @param value
*/
public void setIsForNoble(boolean val)
public void setForNoble(boolean value)
{
_forNoble = val;
_forNoble = value;
}
/**
@@ -119,7 +119,7 @@ public class TeleportLocation
/**
* @return
*/
public boolean getIsForNoble()
public boolean isForNoble()
{
return _forNoble;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java
+1 -1
View File
@@ -626,7 +626,7 @@ public class TradeList
}
final PlayerInstance player = (PlayerInstance) World.getInstance().findObject(_owner.getObjectId());
if ((player == null) || (player.get_instanceLoginTime() != _owner.get_instanceLoginTime()))
if ((player == null) || (player.getInstanceLoginTime() != _owner.getInstanceLoginTime()))
{
LOGGER.warning("Invalid owner of TradeList");
return false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+4 -4
View File
@@ -58,7 +58,7 @@ import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.model.items.type.EtcItemType;
import org.l2jmobius.gameserver.model.quest.EventType;
import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.Say2;
import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -297,7 +297,7 @@ public class Attackable extends NpcInstance
return _isReturningToSpawnPoint;
}
public void setisReturningToSpawnPoint(boolean value)
public void setReturningToSpawnPoint(boolean value)
{
_isReturningToSpawnPoint = value;
}
@@ -798,7 +798,7 @@ public class Attackable extends NpcInstance
// Distribute the Exp and SP between the PlayerInstance and its Summon
if (!attacker.isDead())
{
attacker.addExpAndSp(Math.round(attacker.calcStat(Stats.EXPSP_RATE, exp, null, null)), (int) attacker.calcStat(Stats.EXPSP_RATE, sp, null, null));
attacker.addExpAndSp(Math.round(attacker.calcStat(Stat.EXPSP_RATE, exp, null, null)), (int) attacker.calcStat(Stat.EXPSP_RATE, sp, null, null));
}
}
}
@@ -1964,7 +1964,7 @@ public class Attackable extends NpcInstance
}
// Instant Item Drop :>
final double rateHp = getStat().calcStat(Stats.MAX_HP, 1, this, null);
final double rateHp = getStat().calcStat(Stat.MAX_HP, 1, this, null);
if ((rateHp < 2) && npcTemplate.getType().contentEquals("Monster")) // only Monster with <= 1x HP can drop herbs
{
boolean hp = false;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+133 -133
View File
@@ -101,7 +101,7 @@ import org.l2jmobius.gameserver.model.quest.Quest;
import org.l2jmobius.gameserver.model.quest.QuestState;
import org.l2jmobius.gameserver.model.skills.Calculator;
import org.l2jmobius.gameserver.model.skills.Formulas;
import org.l2jmobius.gameserver.model.skills.Stats;
import org.l2jmobius.gameserver.model.skills.Stat;
import org.l2jmobius.gameserver.model.skills.effects.EffectCharge;
import org.l2jmobius.gameserver.model.skills.funcs.Func;
import org.l2jmobius.gameserver.model.skills.holders.ISkillsHolder;
@@ -167,9 +167,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
private boolean _isFlying = false; // Is flying Wyvern?
private boolean _isFallsdown = false; // Falls down
private boolean _isMuted = false; // Cannot use magic
private boolean _isPsychicalMuted = false; // Cannot use psychical skills
private boolean _isPhysicalMuted = false; // Cannot use psychical skills
private boolean _isKilledAlready = false;
private int _isImobilised = 0;
private int _isImmobilized = 0;
private boolean _isOverloaded = false; // the char is carrying too much
private boolean _isParalyzed = false;
private boolean _isRiding = false; // Is Riding strider?
@@ -290,7 +290,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (!Config.NPC_ATTACKABLE || (!(this instanceof Attackable) && !(this instanceof ControlTowerInstance) && !(this instanceof SiegeFlagInstance) && !(this instanceof EffectPointInstance)))
{
setIsInvul(true);
setInvul(true);
}
}
else // not NpcInstance
@@ -299,12 +299,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
_skills = new ConcurrentHashMap<>();
// If Creature is a PlayerInstance or a Summon, create the basic calculator set
_calculators = new Calculator[Stats.NUM_STATS];
_calculators = new Calculator[Stat.NUM_STATS];
Formulas.getInstance().addFuncsToNewCharacter(this);
if (!(this instanceof Attackable) && !isAttackable() && !(this instanceof DoorInstance))
{
setIsInvul(true);
setInvul(true);
}
}
}
@@ -359,7 +359,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
spawnMe(getPosition().getX(), getPosition().getY(), getPosition().getZ());
}
setIsTeleporting(false);
setTeleporting(false);
if (_isPendingRevive)
{
@@ -680,7 +680,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
abortAttack();
abortCast();
setIsTeleporting(true);
setTeleporting(true);
setTarget(null);
// Remove from world regions zones
@@ -998,7 +998,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (_disableBowAttackEndTime <= GameTimeController.getGameTicks())
{
// Verify if PlayerInstance owns enough MP
final int saMpConsume = (int) getStat().calcStat(Stats.MP_CONSUME, 0, null, null);
final int saMpConsume = (int) getStat().calcStat(Stat.MP_CONSUME, 0, null, null);
final int mpConsume = saMpConsume == 0 ? weaponItem.getMpConsume() : saMpConsume;
if (getStatus().getCurrentMp() < mpConsume)
@@ -1367,8 +1367,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
double angleChar;
double angleTarget;
final int maxRadius = (int) getStat().calcStat(Stats.POWER_ATTACK_RANGE, 66, null, null);
final int maxAngleDiff = (int) getStat().calcStat(Stats.POWER_ATTACK_ANGLE, 120, null, null);
final int maxRadius = (int) getStat().calcStat(Stat.POWER_ATTACK_RANGE, 66, null, null);
final int maxAngleDiff = (int) getStat().calcStat(Stat.POWER_ATTACK_ANGLE, 120, null, null);
if (_target == null)
{
@@ -1380,7 +1380,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
angleChar = Util.convertHeadingToDegree(_heading);
double attackpercent = 85;
final int attackcountmax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 3, null, null);
final int attackcountmax = (int) getStat().calcStat(Stat.ATTACK_COUNT_MAX, 3, null, null);
int attackcount = 0;
if (angleChar <= 0)
@@ -1549,7 +1549,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
// Check if the skill is psychical and if the Creature is not psychical_muted
if (!skill.isMagic() && _isPsychicalMuted && !skill.isPotion())
if (!skill.isMagic() && _isPhysicalMuted && !skill.isPotion())
{
getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
return;
@@ -1857,15 +1857,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (skill.isDance())
{
getStatus().reduceMp(calcStat(Stats.DANCE_MP_CONSUME_RATE, initmpcons, null, null));
getStatus().reduceMp(calcStat(Stat.DANCE_MP_CONSUME_RATE, initmpcons, null, null));
}
else if (skill.isMagic())
{
getStatus().reduceMp(calcStat(Stats.MAGICAL_MP_CONSUME_RATE, initmpcons, null, null));
getStatus().reduceMp(calcStat(Stat.MAGICAL_MP_CONSUME_RATE, initmpcons, null, null));
}
else
{
getStatus().reduceMp(calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, initmpcons, null, null));
getStatus().reduceMp(calcStat(Stat.PHYSICAL_MP_CONSUME_RATE, initmpcons, null, null));
}
su.addAttribute(StatusUpdate.CUR_MP, (int) getStatus().getCurrentMp());
@@ -1984,7 +1984,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
return false;
}
setIsKilledAlready(true);
setKilledAlready(true);
}
// Set target to null and cancel Attack or Cast
setTarget(null);
@@ -2029,7 +2029,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
final PlayerInstance player = (PlayerInstance) this;
// to avoid Event Remove buffs on die
if (player._inEventDM && DM.is_started())
if (player._inEventDM && DM.hasStarted())
{
if (Config.DM_REMOVE_BUFFS_ON_DIE)
{
@@ -2323,7 +2323,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is afraid.
* @param value the new checks if is afraid
*/
public void setIsAfraid(boolean value)
public void setAfraid(boolean value)
{
_isAfraid = value;
}
@@ -2377,7 +2377,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is confused.
* @param value the new checks if is confused
*/
public void setIsConfused(boolean value)
public void setConfused(boolean value)
{
_isConfused = value;
}
@@ -2404,7 +2404,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is fake death.
* @param value the new checks if is fake death
*/
public void setIsFakeDeath(boolean value)
public void setFakeDeath(boolean value)
{
_isFakeDeath = value;
}
@@ -2422,54 +2422,54 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Set the Creature flying mode to True.
* @param mode the new checks if is flying
*/
public void setIsFlying(boolean mode)
public void setFlying(boolean mode)
{
_isFlying = mode;
}
/**
* Checks if is fallsdown.
* @return true, if is fallsdown
* Checks if is falling.
* @return true, if is falling
*/
public boolean isFallsdown()
public boolean isFalling()
{
return _isFallsdown;
}
/**
* Sets the checks if is fallsdown.
* @param value the new checks if is fallsdown
* Sets the checks if is falling.
* @param value the new checks if is falling
*/
public void setIsFallsdown(boolean value)
public void setFalling(boolean value)
{
_isFallsdown = value;
}
/**
* Checks if is imobilised.
* @return true, if is imobilised
* Checks if is immobilized.
* @return true, if is immobilized
*/
public boolean isImobilised()
public boolean isImmobilized()
{
return _isImobilised > 0;
return _isImmobilized > 0;
}
/**
* Sets the checks if is imobilised.
* @param value the new checks if is imobilised
* Sets the checks if is immobilized.
* @param value the new checks if is immobilized
*/
public void setIsImobilised(boolean value)
public void setImmobilized(boolean value)
{
// Stop this if he is moving
getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
if (value)
{
_isImobilised++;
_isImmobilized++;
}
else
{
_isImobilised--;
_isImmobilized--;
}
}
@@ -2522,7 +2522,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is killed already.
* @param value the new checks if is killed already
*/
public void setIsKilledAlready(boolean value)
public void setKilledAlready(boolean value)
{
_isKilledAlready = value;
}
@@ -2540,27 +2540,27 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is muted.
* @param value the new checks if is muted
*/
public void setIsMuted(boolean value)
public void setMuted(boolean value)
{
_isMuted = value;
}
/**
* Checks if is psychical muted.
* @return true, if is psychical muted
* Checks if is physical muted.
* @return true, if is physical muted
*/
public boolean isPsychicalMuted()
public boolean isPhysicalMuted()
{
return _isPsychicalMuted;
return _isPhysicalMuted;
}
/**
* Sets the checks if is psychical muted.
* @param value the new checks if is psychical muted
* Sets the checks if is physical muted.
* @param value the new checks if is physical muted
*/
public void setIsPsychicalMuted(boolean value)
public void setPhysicalMuted(boolean value)
{
_isPsychicalMuted = value;
_isPhysicalMuted = value;
}
/**
@@ -2569,7 +2569,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public boolean isMovementDisabled()
{
return _isImmobileUntilAttacked || _isStunned || _isRooted || _isSleeping || _isOverloaded || _isParalyzed || isImobilised() || _isFakeDeath || _isFallsdown;
return _isImmobileUntilAttacked || _isStunned || _isRooted || _isSleeping || _isOverloaded || _isParalyzed || isImmobilized() || _isFakeDeath || _isFallsdown;
}
/**
@@ -2594,7 +2594,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Set the overloaded status of the Creature is overloaded (if True, the PlayerInstance can't take more item).
* @param value the new checks if is overloaded
*/
public void setIsOverloaded(boolean value)
public void setOverloaded(boolean value)
{
_isOverloaded = value;
}
@@ -2612,7 +2612,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is paralyzed.
* @param value the new checks if is paralyzed
*/
public void setIsParalyzed(boolean value)
public void setParalyzed(boolean value)
{
if (_petrified)
{
@@ -2666,7 +2666,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Set the Creature riding mode to True.
* @param mode the new checks if is riding
*/
public void setIsRiding(boolean mode)
public void setRiding(boolean mode)
{
_isRiding = mode;
}
@@ -2684,7 +2684,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is rooted.
* @param value the new checks if is rooted
*/
public void setIsRooted(boolean value)
public void setRooted(boolean value)
{
_isRooted = value;
}
@@ -2702,7 +2702,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is running.
* @param value the new checks if is running
*/
public void setIsRunning(boolean value)
public void setRunning(boolean value)
{
_isRunning = value;
broadcastPacket(new ChangeMoveType(this));
@@ -2715,7 +2715,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (!_isRunning)
{
setIsRunning(true);
setRunning(true);
}
}
@@ -2732,7 +2732,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is immobile until attacked.
* @param value the new checks if is immobile until attacked
*/
public void setIsImmobileUntilAttacked(boolean value)
public void setImmobileUntilAttacked(boolean value)
{
_isImmobileUntilAttacked = value;
}
@@ -2750,7 +2750,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is sleeping.
* @param value the new checks if is sleeping
*/
public void setIsSleeping(boolean value)
public void setSleeping(boolean value)
{
_isSleeping = value;
}
@@ -2768,7 +2768,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is stunned.
* @param value the new checks if is stunned
*/
public void setIsStunned(boolean value)
public void setStunned(boolean value)
{
_isStunned = value;
}
@@ -2786,7 +2786,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is betrayed.
* @param value the new checks if is betrayed
*/
public void setIsBetrayed(boolean value)
public void setBetrayed(boolean value)
{
_isBetrayed = value;
}
@@ -2804,23 +2804,23 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is teleporting.
* @param value the new checks if is teleporting
*/
public void setIsTeleporting(boolean value)
public void setTeleporting(boolean value)
{
_isTeleporting = value;
}
/**
* Sets the checks if is invul.
* @param b the new checks if is invul
* @param value the new checks if is invul
*/
public void setIsInvul(boolean b)
public void setInvul(boolean value)
{
if (_petrified)
{
return;
}
_isInvul = b;
_isInvul = value;
}
/**
@@ -2966,7 +2966,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (_isRunning)
{
setIsRunning(false);
setRunning(false);
}
}
@@ -3589,7 +3589,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startImmobileUntilAttacked()
{
setIsImmobileUntilAttacked(true);
setImmobileUntilAttacked(true);
abortAttack();
abortCast();
getAI().notifyEvent(CtrlEvent.EVT_SLEEPING);
@@ -3602,7 +3602,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startConfused()
{
setIsConfused(true);
setConfused(true);
getAI().notifyEvent(CtrlEvent.EVT_CONFUSED);
updateAbnormalEffect();
}
@@ -3613,8 +3613,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startFakeDeath()
{
setIsFallsdown(true);
setIsFakeDeath(true);
setFalling(true);
setFakeDeath(true);
/* Aborts any attacks/casts if fake dead */
abortAttack();
abortCast();
@@ -3629,7 +3629,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startFear()
{
setIsAfraid(true);
setAfraid(true);
getAI().notifyEvent(CtrlEvent.EVT_AFFRAID);
updateAbnormalEffect();
}
@@ -3640,7 +3640,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startMuted()
{
setIsMuted(true);
setMuted(true);
/* Aborts any casts if muted */
abortCast();
getAI().notifyEvent(CtrlEvent.EVT_MUTED);
@@ -3653,7 +3653,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startPsychicalMuted()
{
setIsPsychicalMuted(true);
setPhysicalMuted(true);
getAI().notifyEvent(CtrlEvent.EVT_MUTED);
updateAbnormalEffect();
}
@@ -3664,7 +3664,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startRooted()
{
setIsRooted(true);
setRooted(true);
stopMove(null);
getAI().notifyEvent(CtrlEvent.EVT_ROOTED, null);
updateAbnormalEffect();
@@ -3676,7 +3676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startSleeping()
{
setIsSleeping(true);
setSleeping(true);
/* Aborts any attacks/casts if sleeped */
abortAttack();
abortCast();
@@ -3702,7 +3702,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
return;
}
setIsStunned(true);
setStunned(true);
/* Aborts any attacks/casts if stunned */
abortAttack();
abortCast();
@@ -3717,7 +3717,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void startBetray()
{
setIsBetrayed(true);
setBetrayed(true);
getAI().notifyEvent(CtrlEvent.EVT_BETRAYED, null);
updateAbnormalEffect();
}
@@ -3728,7 +3728,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
public void stopBetray()
{
stopEffects(Effect.EffectType.BETRAY);
setIsBetrayed(false);
setBetrayed(false);
updateAbnormalEffect();
}
@@ -3796,7 +3796,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
stopSkillEffects(effect.getSkill().getNegateId());
}
setIsImmobileUntilAttacked(false);
setImmobileUntilAttacked(false);
getAI().notifyEvent(CtrlEvent.EVT_THINK);
updateAbnormalEffect();
}
@@ -3824,7 +3824,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsConfused(false);
setConfused(false);
getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
updateAbnormalEffect();
}
@@ -3960,8 +3960,8 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsFakeDeath(false);
setIsFallsdown(false);
setFakeDeath(false);
setFalling(false);
// if this is a player instance, start the grace period for this character (grace from mobs only)!
if (this instanceof PlayerInstance)
{
@@ -3997,7 +3997,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsAfraid(false);
setAfraid(false);
updateAbnormalEffect();
}
@@ -4024,7 +4024,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsMuted(false);
setMuted(false);
updateAbnormalEffect();
}
@@ -4043,7 +4043,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsPsychicalMuted(false);
setPhysicalMuted(false);
updateAbnormalEffect();
}
@@ -4070,7 +4070,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsRooted(false);
setRooted(false);
getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
updateAbnormalEffect();
}
@@ -4098,7 +4098,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsSleeping(false);
setSleeping(false);
getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
updateAbnormalEffect();
}
@@ -4131,7 +4131,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
removeEffect(effect);
}
setIsStunned(false);
setStunned(false);
getAI().notifyEvent(CtrlEvent.EVT_THINK, null);
updateAbnormalEffect();
}
@@ -4329,7 +4329,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
ae |= ABNORMAL_EFFECT_AFRAID;
}
if (_isPsychicalMuted)
if (_isPhysicalMuted)
{
ae |= ABNORMAL_EFFECT_MUTED;
}
@@ -4756,9 +4756,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (_calculators == NPC_STD_CALCULATOR)
{
// Create a copy of the standard NPC Calculator set
_calculators = new Calculator[Stats.NUM_STATS];
_calculators = new Calculator[Stat.NUM_STATS];
for (int i = 0; i < Stats.NUM_STATS; i++)
for (int i = 0; i < Stat.NUM_STATS; i++)
{
if (NPC_STD_CALCULATOR[i] != null)
{
@@ -4798,7 +4798,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public synchronized void addStatFuncs(Func[] funcs)
{
final List<Stats> modifiedStats = new ArrayList<>();
final List<Stat> modifiedStats = new ArrayList<>();
for (Func f : funcs)
{
@@ -4855,7 +4855,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
int i = 0;
for (; i < Stats.NUM_STATS; i++)
for (; i < Stat.NUM_STATS; i++)
{
if (!Calculator.equalsCals(_calculators[i], NPC_STD_CALCULATOR[i]))
{
@@ -4863,7 +4863,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
}
if (i >= Stats.NUM_STATS)
if (i >= Stat.NUM_STATS)
{
_calculators = NPC_STD_CALCULATOR;
}
@@ -4888,7 +4888,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public synchronized void removeStatFuncs(Func[] funcs)
{
final List<Stats> modifiedStats = new ArrayList<>();
final List<Stat> modifiedStats = new ArrayList<>();
for (Func f : funcs)
{
@@ -4924,7 +4924,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public void removeStatsOwner(Object owner)
{
List<Stats> modifiedStats = null;
List<Stat> modifiedStats = null;
int i = 0;
// Go through the Calculator set
@@ -4956,7 +4956,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (this instanceof NpcInstance)
{
i = 0;
for (; i < Stats.NUM_STATS; i++)
for (; i < Stat.NUM_STATS; i++)
{
if (!Calculator.equalsCals(_calculators[i], NPC_STD_CALCULATOR[i]))
{
@@ -4964,7 +4964,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
}
if (i >= Stats.NUM_STATS)
if (i >= Stat.NUM_STATS)
{
_calculators = NPC_STD_CALCULATOR;
}
@@ -4981,7 +4981,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Broadcast modified stats.
* @param stats the stats
*/
public void broadcastModifiedStats(List<Stats> stats)
public void broadcastModifiedStats(List<Stat> stats)
{
if ((stats == null) || stats.isEmpty())
{
@@ -4992,9 +4992,9 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
boolean otherStats = false;
StatusUpdate su = null;
for (Stats stat : stats)
for (Stat stat : stats)
{
if (stat == Stats.POWER_ATTACK_SPEED)
if (stat == Stat.POWER_ATTACK_SPEED)
{
if (su == null)
{
@@ -5003,7 +5003,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
su.addAttribute(StatusUpdate.ATK_SPD, getStat().getPAtkSpd());
}
else if (stat == Stats.MAGIC_ATTACK_SPEED)
else if (stat == Stat.MAGIC_ATTACK_SPEED)
{
if (su == null)
{
@@ -5012,7 +5012,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
su.addAttribute(StatusUpdate.CAST_SPD, getStat().getMAtkSpd());
}
else if (stat == Stats.MAX_CP)
else if (stat == Stat.MAX_CP)
{
if (this instanceof PlayerInstance)
{
@@ -5024,7 +5024,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
su.addAttribute(StatusUpdate.MAX_CP, getStat().getMaxCp());
}
}
else if (stat == Stats.RUN_SPEED)
else if (stat == Stat.RUN_SPEED)
{
broadcastFull = true;
}
@@ -5162,38 +5162,38 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* Sets the client x.
* @param val the new client x
* @param value the new client x
*/
public void setClientX(int val)
public void setClientX(int value)
{
_clientX = val;
_clientX = value;
}
/**
* Sets the client y.
* @param val the new client y
* @param value the new client y
*/
public void setClientY(int val)
public void setClientY(int value)
{
_clientY = val;
_clientY = value;
}
/**
* Sets the client z.
* @param val the new client z
* @param value the new client z
*/
public void setClientZ(int val)
public void setClientZ(int value)
{
_clientZ = val;
_clientZ = value;
}
/**
* Sets the client heading.
* @param val the new client heading
* @param value the new client heading
*/
public void setClientHeading(int val)
public void setClientHeading(int value)
{
_clientHeading = val;
_clientHeading = value;
}
/**
@@ -6674,7 +6674,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (!isBow) // Do not reflect or absorb if weapon is of type bow
{
// Absorb HP from the damage inflicted
final double absorbPercent = getStat().calcStat(Stats.ABSORB_DAMAGE_PERCENT, 0, null, null);
final double absorbPercent = getStat().calcStat(Stat.ABSORB_DAMAGE_PERCENT, 0, null, null);
if (absorbPercent > 0)
{
@@ -6693,7 +6693,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
// Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary
final double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null);
final double reflectPercent = target.getStat().calcStat(Stat.REFLECT_DAMAGE_PERCENT, 0, null, null);
if (reflectPercent > 0)
{
@@ -7907,15 +7907,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (skill.isDance())
{
getStatus().reduceMp(calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume, null, null));
getStatus().reduceMp(calcStat(Stat.DANCE_MP_CONSUME_RATE, mpConsume, null, null));
}
else if (skill.isMagic())
{
getStatus().reduceMp(calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume, null, null));
getStatus().reduceMp(calcStat(Stat.MAGICAL_MP_CONSUME_RATE, mpConsume, null, null));
}
else
{
getStatus().reduceMp(calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume, null, null));
getStatus().reduceMp(calcStat(Stat.PHYSICAL_MP_CONSUME_RATE, mpConsume, null, null));
}
su.addAttribute(StatusUpdate.CUR_MP, (int) getStatus().getCurrentMp());
@@ -7927,7 +7927,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
double consumeHp;
consumeHp = calcStat(Stats.HP_CONSUME_RATE, skill.getHpConsume(), null, null);
consumeHp = calcStat(Stat.HP_CONSUME_RATE, skill.getHpConsume(), null, null);
if ((consumeHp + 1) >= getStatus().getCurrentHp())
{
@@ -8998,7 +8998,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* @param skill the skill
* @return the double
*/
public double calcStat(Stats stat, double init, Creature target, Skill skill)
public double calcStat(Stat stat, double init, Creature target, Skill skill)
{
return getStat().calcStat(stat, init, target, skill);
}
@@ -9727,7 +9727,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* @return the _advanceFlag
*/
public boolean is_advanceFlag()
public boolean isAdvanceFlag()
{
return _advanceFlag;
}
@@ -9735,7 +9735,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* @param advanceFlag
*/
public void set_advanceFlag(boolean advanceFlag)
public void setAdvanceFlag(boolean advanceFlag)
{
_advanceFlag = advanceFlag;
}
@@ -9743,7 +9743,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* @param advanceMultiplier
*/
public void set_advanceMultiplier(int advanceMultiplier)
public void setAdvanceMultiplier(int advanceMultiplier)
{
_advanceMultiplier = advanceMultiplier;
}
@@ -9755,7 +9755,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
*/
public boolean reflectSkill(Skill skill)
{
return Rnd.get(100) < calcStat(skill.isMagic() ? Stats.REFLECT_SKILL_MAGIC : Stats.REFLECT_SKILL_PHYSIC, 0, null, null);
return Rnd.get(100) < calcStat(skill.isMagic() ? Stat.REFLECT_SKILL_MAGIC : Stat.REFLECT_SKILL_PHYSIC, 0, null, null);
}
/**
@@ -9767,7 +9767,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (!skill.isMagic() && (skill.getCastRange() <= 40))
{
final double venganceChance = calcStat(Stats.VENGEANCE_SKILL_PHYSICAL_DAMAGE, 0, null, skill);
final double venganceChance = calcStat(Stat.VENGEANCE_SKILL_PHYSICAL_DAMAGE, 0, null, skill);
if (venganceChance > Rnd.get(100))
{
return true;
@@ -9918,15 +9918,15 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (petrified)
{
setIsParalyzed(petrified);
setIsInvul(petrified);
setParalyzed(petrified);
setInvul(petrified);
_petrified = petrified;
}
else
{
_petrified = petrified;
setIsParalyzed(petrified);
setIsInvul(petrified);
setParalyzed(petrified);
setInvul(petrified);
}
}
@@ -10117,7 +10117,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Sets the checks if is buff protected.
* @param value the new checks if is buff protected
*/
public void setIsBuffProtected(boolean value)
public void setBuffProtected(boolean value)
{
_isBuffProtected = value;
}
@@ -10135,7 +10135,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
* Gets the _triggered skills.
* @return the _triggeredSkills
*/
public Map<Integer, Skill> get_triggeredSkills()
public Map<Integer, Skill> getTriggeredSkills()
{
return _triggeredSkills;
}
@@ -10178,7 +10178,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* @param value the _isKillable to set
*/
public void setIsUnkillable(boolean value)
public void setUnkillable(boolean value)
{
_isUnkillable = value;
}
@@ -10194,7 +10194,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
/**
* @param value the _isAttackDisabled to set
*/
public void setIsAttackDisabled(boolean value)
public void setAttackDisabled(boolean value)
{
_isAttackDisabled = value;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Playable.java
+6 -6
View File
@@ -211,7 +211,7 @@ public abstract class Playable extends Creature
* Sets the checks if is noblesse blessed.
* @param value the new checks if is noblesse blessed
*/
public void setIsNoblesseBlessed(boolean value)
public void setNoblesseBlessed(boolean value)
{
_isNoblesseBlessed = value;
}
@@ -223,7 +223,7 @@ public abstract class Playable extends Creature
public void startNoblesseBlessing(Effect effect)
{
_lastNoblessEffect = effect;
setIsNoblesseBlessed(true);
setNoblesseBlessed(true);
updateAbnormalEffect();
}
@@ -248,7 +248,7 @@ public abstract class Playable extends Creature
removeEffect(effect);
}
setIsNoblesseBlessed(false);
setNoblesseBlessed(false);
updateAbnormalEffect();
_lastNoblessEffect = null;
@@ -327,7 +327,7 @@ public abstract class Playable extends Creature
* Sets the checks if is phoenix blessed.
* @param value the new checks if is phoenix blessed
*/
public void setIsPhoenixBlessed(boolean value)
public void setPhoenixBlessed(boolean value)
{
_isPhoenixBlessed = value;
}
@@ -339,7 +339,7 @@ public abstract class Playable extends Creature
public void startPhoenixBlessing(Effect effect)
{
_lastPhoenixBlessedEffect = effect;
setIsPhoenixBlessed(true);
setPhoenixBlessed(true);
updateAbnormalEffect();
}
@@ -363,7 +363,7 @@ public abstract class Playable extends Creature
removeEffect(effect);
}
setIsPhoenixBlessed(false);
setPhoenixBlessed(false);
updateAbnormalEffect();
_lastPhoenixBlessedEffect = null;
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java
+4 -4
View File
@@ -450,9 +450,9 @@ public abstract class Summon extends Playable
_attackRange = range;
}
public void setFollowStatus(boolean state)
public void setFollowStatus(boolean value)
{
_follow = state;
_follow = value;
if (_follow)
{
@@ -735,9 +735,9 @@ public abstract class Summon extends Playable
}
@Override
public void setIsImobilised(boolean value)
public void setImmobilized(boolean value)
{
super.setIsImobilised(value);
super.setImmobilized(value);
if (value)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AdventurerInstance.java
+3 -3
View File
@@ -85,17 +85,17 @@ public class AdventurerInstance extends FolkInstance
}
@Override
public String getHtmlPath(int npcId, int val)
public String getHtmlPath(int npcId, int value)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = "" + npcId;
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/adventurer_guildsman/" + pom + ".htm";
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/AuctioneerInstance.java
+1 -1
View File
@@ -645,7 +645,7 @@ public class AuctioneerInstance extends FolkInstance
{
if ((getCastle() != null) && (getCastle().getCastleId() > 0))
{
if (getCastle().getSiege().getIsInProgress())
if (getCastle().getSiege().isInProgress())
{
return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/BlacksmithInstance.java
+3 -3
View File
@@ -41,16 +41,16 @@ public class BlacksmithInstance extends FolkInstance
}
@Override
public String getHtmlPath(int npcId, int val)
public String getHtmlPath(int npcId, int value)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = "" + npcId;
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/blacksmith/" + pom + ".htm";
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleBlacksmithInstance.java
+4 -4
View File
@@ -102,7 +102,7 @@ public class CastleBlacksmithInstance extends FolkInstance
}
}
private void showMessageWindow(PlayerInstance player, int val)
private void showMessageWindow(PlayerInstance player, int value)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
String filename = "data/html/castleblacksmith/castleblacksmith-no.htm";
@@ -117,13 +117,13 @@ public class CastleBlacksmithInstance extends FolkInstance
else if (condition == COND_OWNER)
{
// Clan owns castle
if (val == 0)
if (value == 0)
{
filename = "data/html/castleblacksmith/castleblacksmith.htm";
}
else
{
filename = "data/html/castleblacksmith/castleblacksmith-" + val + ".htm";
filename = "data/html/castleblacksmith/castleblacksmith-" + value + ".htm";
}
}
}
@@ -145,7 +145,7 @@ public class CastleBlacksmithInstance extends FolkInstance
if ((getCastle() != null) && (getCastle().getCastleId() > 0) && (player.getClan() != null))
{
if (getCastle().getSiege().getIsInProgress())
if (getCastle().getSiege().isInProgress())
{
return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java
+1 -1
View File
@@ -627,7 +627,7 @@ public class CastleChamberlainInstance extends FolkInstance
{
if ((getCastle() != null) && (getCastle().getCastleId() > 0) && (player.getClan() != null))
{
if (getCastle().getSiege().getIsInProgress())
if (getCastle().getSiege().isInProgress())
{
return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleMagicianInstance.java
+4 -4
View File
@@ -34,7 +34,7 @@ public class CastleMagicianInstance extends NpcInstance
protected static final int COND_OWNER = 2;
/**
* Instantiates a new l2 castle magician instance.
* Instantiates a new castle magician instance.
* @param objectId the object id
* @param template the template
*/
@@ -44,7 +44,7 @@ public class CastleMagicianInstance extends NpcInstance
}
@Override
public void showChatWindow(PlayerInstance player, int val)
public void showChatWindow(PlayerInstance player, int value)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
String filename = "data/html/castlemagician/magician-no.htm";
@@ -58,13 +58,13 @@ public class CastleMagicianInstance extends NpcInstance
}
else if (condition == COND_OWNER) // Clan owns castle
{
if (val == 0)
if (value == 0)
{
filename = "data/html/castlemagician/magician.htm";
}
else
{
filename = "data/html/castlemagician/magician-" + val + ".htm";
filename = "data/html/castlemagician/magician-" + value + ".htm";
}
}
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleTeleporterInstance.java
+5 -5
View File
@@ -34,7 +34,7 @@ public class CastleTeleporterInstance extends NpcInstance
private boolean _currentTask = false;
/**
* Instantiates a new l2 castle teleporter instance.
* Instantiates a new castle teleporter instance.
* @param objectId the object id
* @param template the template
*/
@@ -54,7 +54,7 @@ public class CastleTeleporterInstance extends NpcInstance
int delay;
if (!_currentTask)
{
if (getCastle().getSiege().getIsInProgress() && (getCastle().getSiege().getControlTowerCount() == 0))
if (getCastle().getSiege().isInProgress() && (getCastle().getSiege().getControlTowerCount() == 0))
{
delay = 480000;
}
@@ -82,7 +82,7 @@ public class CastleTeleporterInstance extends NpcInstance
String filename;
if (!_currentTask)
{
if (getCastle().getSiege().getIsInProgress() && (getCastle().getSiege().getControlTowerCount() == 0))
if (getCastle().getSiege().isInProgress() && (getCastle().getSiege().getControlTowerCount() == 0))
{
filename = "data/html/castleteleporter/MassGK-2.htm";
}
@@ -129,8 +129,8 @@ public class CastleTeleporterInstance extends NpcInstance
return _currentTask;
}
public void setTask(boolean state)
public void setTask(boolean value)
{
_currentTask = state;
_currentTask = value;
}
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleWarehouseInstance.java
+5 -5
View File
@@ -35,7 +35,7 @@ public class CastleWarehouseInstance extends FolkInstance
protected static final int COND_OWNER = 2;
/**
* Instantiates a new l2 castle warehouse instance.
* Instantiates a new castle warehouse instance.
* @param objectId the object id
* @param template the template
*/
@@ -171,7 +171,7 @@ public class CastleWarehouseInstance extends FolkInstance
}
@Override
public void showChatWindow(PlayerInstance player, int val)
public void showChatWindow(PlayerInstance player, int value)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
String filename = "data/html/castlewarehouse/castlewarehouse-no.htm";
@@ -185,13 +185,13 @@ public class CastleWarehouseInstance extends FolkInstance
}
else if (condition == COND_OWNER) // Clan owns castle
{
if (val == 0)
if (value == 0)
{
filename = "data/html/castlewarehouse/castlewarehouse.htm";
}
else
{
filename = "data/html/castlewarehouse/castlewarehouse-" + val + ".htm";
filename = "data/html/castlewarehouse/castlewarehouse-" + value + ".htm";
}
}
}
@@ -216,7 +216,7 @@ public class CastleWarehouseInstance extends FolkInstance
}
if ((getCastle() != null) && (getCastle().getCastleId() > 0) && (player.getClan() != null))
{
if (getCastle().getSiege().getIsInProgress())
if (getCastle().getSiege().isInProgress())
{
return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
}
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
+10 -10
View File
@@ -54,7 +54,7 @@ public class ClanHallManagerInstance extends FolkInstance
private int _clanHallId = -1;
/**
* Instantiates a new l2 clan hall manager instance.
* Instantiates a new clan hall manager instance.
* @param objectId the object id
* @param template the template
*/
@@ -1047,11 +1047,11 @@ public class ClanHallManagerInstance extends FolkInstance
/**
* Do teleport.
* @param player the player
* @param val the val
* @param value the value
*/
private void doTeleport(PlayerInstance player, int val)
private void doTeleport(PlayerInstance player, int value)
{
final TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
final TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(value);
if (list != null)
{
// you cannot teleport to village that is in siege Not sure about this one though
@@ -1067,7 +1067,7 @@ public class ClanHallManagerInstance extends FolkInstance
}
else
{
LOGGER.warning("No teleport destination with id:" + val);
LOGGER.warning("No teleport destination with id:" + value);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
}
@@ -1075,20 +1075,20 @@ public class ClanHallManagerInstance extends FolkInstance
/**
* Show buy window.
* @param player the player
* @param val the val
* @param value the value
*/
private void showBuyWindow(PlayerInstance player, int val)
private void showBuyWindow(PlayerInstance player, int value)
{
double taxRate = 0;
if (getIsInTown())
if (isInTown())
{
taxRate = getCastle().getTaxRate();
}
player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(val);
final StoreTradeList list = TradeController.getInstance().getBuyList(value);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
@@ -1098,7 +1098,7 @@ public class ClanHallManagerInstance extends FolkInstance
else
{
LOGGER.warning("possible client hacker: " + player.getName() + " attempting to buy from GM shop! (PledgeHallManagerInstance)");
LOGGER.warning("buylist id:" + val);
LOGGER.warning("buylist id:" + value);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallSiegeInfInstance.java
+3 -3
View File
@@ -345,19 +345,19 @@ public class ClanHallSiegeInfInstance extends NpcInstance
player.sendPacket(html);
}
public void showMessageWindow(PlayerInstance player, int val)
public void showMessageWindow(PlayerInstance player, int value)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
long startSiege = 0;
final int npcId = getTemplate().getNpcId();
String filename;
if (val == 0)
if (value == 0)
{
filename = "data/html/default/" + npcId + ".htm";
}
else
{
filename = "data/html/default/" + npcId + "-" + val + ".htm";
filename = "data/html/default/" + npcId + "-" + value + ".htm";
}
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(filename);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClassMasterInstance.java
+4 -4
View File
@@ -35,7 +35,7 @@ public class ClassMasterInstance extends FolkInstance
private static ClassMasterInstance _instance;
/**
* Instantiates a new l2 class master instance.
* Instantiates a new class master instance.
* @param objectId the object id
* @param template the template
*/
@@ -669,11 +669,11 @@ public class ClassMasterInstance extends FolkInstance
/**
* Change class.
* @param player the player
* @param val the val
* @param value the value
*/
private void changeClass(PlayerInstance player, int val)
private void changeClass(PlayerInstance player, int value)
{
player.setClassId(val);
player.setClassId(value);
if (player.isSubClassActive())
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CommanderInstance.java
+3 -3
View File
@@ -47,7 +47,7 @@ public class CommanderInstance extends Attackable
public boolean isAutoAttackable(Creature attacker)
{
// Attackable during siege by all except defenders
return (attacker instanceof PlayerInstance) && (getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().getIsInProgress() && !getFort().getSiege().checkIsDefender(((PlayerInstance) attacker).getClan());
return (attacker instanceof PlayerInstance) && (getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((PlayerInstance) attacker).getClan());
}
@Override
@@ -82,7 +82,7 @@ public class CommanderInstance extends Attackable
return false;
}
if (getFort().getSiege().getIsInProgress())
if (getFort().getSiege().isInProgress())
{
getFort().getSiege().killedCommander(this);
}
@@ -117,7 +117,7 @@ public class CommanderInstance extends Attackable
{
if (!isInsideRadius(_homeX, _homeY, 40, false))
{
setisReturningToSpawnPoint(true);
setReturningToSpawnPoint(true);
clearAggroList();
if (hasAI())
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControlTowerInstance.java
+3 -3
View File
@@ -43,14 +43,14 @@ public class ControlTowerInstance extends NpcInstance
public boolean isAttackable()
{
// Attackable during siege by attacker only
return (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().getIsInProgress();
return (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().isInProgress();
}
@Override
public boolean isAutoAttackable(Creature attacker)
{
// Attackable during siege by attacker only
return (attacker instanceof PlayerInstance) && (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().getIsInProgress() && getCastle().getSiege().checkIsAttacker(((PlayerInstance) attacker).getClan());
return (attacker instanceof PlayerInstance) && (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(((PlayerInstance) attacker).getClan());
}
@Override
@@ -99,7 +99,7 @@ public class ControlTowerInstance extends NpcInstance
public void onDeath()
{
if (getCastle().getSiege().getIsInProgress())
if (getCastle().getSiege().isInProgress())
{
getCastle().getSiege().killedCT(this);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ControllableMobInstance.java
+1
View File
@@ -84,6 +84,7 @@ public class ControllableMobInstance extends MonsterInstance
return _isInvul;
}
@Override
public void setInvul(boolean isInvul)
{
_isInvul = isInvul;
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class CubicInstance
private Future<?> _actionTask;
/**
* Instantiates a new l2 cubic instance.
* Instantiates a new cubic instance.
* @param owner the owner
* @param id the id
* @param level the level
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
+6 -6
View File
@@ -182,7 +182,7 @@ public class DoorInstance extends Creature
}
/**
* Instantiates a new l2 door instance.
* Instantiates a new door instance.
* @param objectId the object id
* @param template the template
* @param doorId the door id
@@ -418,8 +418,8 @@ public class DoorInstance extends Creature
}
final Clan clan = player.getClan();
final boolean isCastle = (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().getIsInProgress() && getCastle().getSiege().checkIsAttacker(clan);
final boolean isFort = (getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().getIsInProgress() && getFort().getSiege().checkIsAttacker(clan);
final boolean isCastle = (getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(clan);
final boolean isFort = (getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().isInProgress() && getFort().getSiege().checkIsAttacker(clan);
if (isFort)
{
if ((clan != null) && (clan == getFort().getOwnerClan()))
@@ -434,7 +434,7 @@ public class DoorInstance extends Creature
return false;
}
}
return isCastle || isFort || DevastatedCastle.getInstance().getIsInProgress();
return isCastle || isFort || DevastatedCastle.getInstance().isInProgress();
}
/**
@@ -908,8 +908,8 @@ public class DoorInstance extends Creature
return false;
}
final boolean isFort = ((getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().getIsInProgress());
final boolean isCastle = ((getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().getIsInProgress());
final boolean isFort = ((getFort() != null) && (getFort().getFortId() > 0) && getFort().getSiege().isInProgress());
final boolean isCastle = ((getCastle() != null) && (getCastle().getCastleId() > 0) && getCastle().getSiege().isInProgress());
if (isFort || isCastle)
{
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FestivalGuideInstance.java
+8 -8
View File
@@ -44,7 +44,7 @@ public class FestivalGuideInstance extends FolkInstance
protected int _redStonesNeeded;
/**
* Instantiates a new l2 festival guide instance.
* Instantiates a new festival guide instance.
* @param objectId the object id
* @param template the template
*/
@@ -446,15 +446,15 @@ public class FestivalGuideInstance extends FolkInstance
/**
* Show chat window.
* @param player the player
* @param val the val
* @param value the value
* @param suffix the suffix
* @param isDescription the is description
*/
private void showChatWindow(PlayerInstance player, int val, String suffix, boolean isDescription)
private void showChatWindow(PlayerInstance player, int value, String suffix, boolean isDescription)
{
String filename = SevenSigns.SEVEN_SIGNS_HTML_PATH + "festival/";
filename += isDescription ? "desc_" : "festival_";
filename += suffix != null ? val + suffix + ".htm" : val + ".htm";
filename += suffix != null ? value + suffix + ".htm" : value + ".htm";
// Send a Server->Client NpcHtmlMessage containing the text of the NpcInstance to the PlayerInstance
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -462,23 +462,23 @@ public class FestivalGuideInstance extends FolkInstance
html.replace("%objectId%", String.valueOf(getObjectId()));
html.replace("%festivalType%", SevenSignsFestival.getFestivalName(_festivalType));
html.replace("%cycleMins%", String.valueOf(SevenSignsFestival.getInstance().getMinsToNextCycle()));
if (!isDescription && "2b".equals(val + suffix))
if (!isDescription && "2b".equals(value + suffix))
{
html.replace("%minFestivalPartyMembers%", String.valueOf(Config.ALT_FESTIVAL_MIN_PLAYER));
}
// If the stats or bonus table is required, construct them.
if (val == 5)
if (value == 5)
{
html.replace("%statsTable%", getStatsTable());
}
if (val == 6)
if (value == 6)
{
html.replace("%bonusTable%", getBonusTable());
}
// festival's fee
if (val == 1)
if (value == 1)
{
html.replace("%blueStoneNeeded%", String.valueOf(_blueStonesNeeded));
html.replace("%greenStoneNeeded%", String.valueOf(_greenStonesNeeded));
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
+7 -7
View File
@@ -43,31 +43,31 @@ public class FishermanInstance extends FolkInstance
}
@Override
public String getHtmlPath(int npcId, int val)
public String getHtmlPath(int npcId, int value)
{
String pom = "";
if (val == 0)
if (value == 0)
{
pom = "" + npcId;
}
else
{
pom = npcId + "-" + val;
pom = npcId + "-" + value;
}
return "data/html/fisherman/" + pom + ".htm";
}
private void showBuyWindow(PlayerInstance player, int val)
private void showBuyWindow(PlayerInstance player, int value)
{
double taxRate = 0;
if (getIsInTown())
if (isInTown())
{
taxRate = getCastle().getTaxRate();
}
player.tempInvetoryDisable();
final StoreTradeList list = TradeController.getInstance().getBuyList(val);
final StoreTradeList list = TradeController.getInstance().getBuyList(value);
if ((list != null) && list.getNpcId().equals(String.valueOf(getNpcId())))
{
@@ -77,7 +77,7 @@ public class FishermanInstance extends FolkInstance
else
{
LOGGER.warning("possible client hacker: " + player.getName() + " attempting to buy from GM shop! (L2FishermanInstance)");
LOGGER.warning("buylist id:" + val);
LOGGER.warning("buylist id:" + value);
}
player.sendPacket(ActionFailed.STATIC_PACKET);
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class FolkInstance extends NpcInstance
private final List<ClassId> _classesToTeach;
/**
* Instantiates a new l2 folk instance.
* Instantiates a new folk instance.
* @param objectId the object id
* @param template the template
*/

Some files were not shown because too many files have changed in this diff Show More