diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java index 3ce61f66de..6959e01e03 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java @@ -292,12 +292,12 @@ final class MC_Show extends AbstractNpcAI final int hours = (gameTime / 60) % 24; final int minutes = gameTime % 60; int hourDiff, minDiff; - hourDiff = (20 - hours); + hourDiff = 20 - hours; if (hourDiff < 0) { hourDiff = 24 - (hourDiff *= -1); } - minDiff = (30 - minutes); + minDiff = 30 - minutes; if (minDiff < 0) { minDiff = 60 - (minDiff *= -1); @@ -500,25 +500,22 @@ final class MC_Show extends AbstractNpcAI IS_STARTED = false; npc.deleteMe(); } - else + else if (TALKS.containsKey(event)) { - if (TALKS.containsKey(event)) + final ShoutInfo si = TALKS.get(event); + if (si != null) { - final ShoutInfo si = TALKS.get(event); - if (si != null) - { - autoChat(npc, si.getNpcStringId(), ChatType.NPC_SHOUT); - startQuestTimer(si.getNextEvent(), si.getTime(), npc, null); - } + autoChat(npc, si.getNpcStringId(), ChatType.NPC_SHOUT); + startQuestTimer(si.getNextEvent(), si.getTime(), npc, null); } - else if (WALKS.containsKey(event)) + } + else if (WALKS.containsKey(event)) + { + final WalkInfo wi = WALKS.get(event); + if (wi != null) { - final WalkInfo wi = WALKS.get(event); - if (wi != null) - { - npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, wi.getCharPos()); - startQuestTimer(wi.getNextEvent(), wi.getTime(), npc, null); - } + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, wi.getCharPos()); + startQuestTimer(wi.getNextEvent(), wi.getTime(), npc, null); } } } diff --git a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java index a88b9fc93c..3c1cdc4aab 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java +++ b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java @@ -74,7 +74,7 @@ final class AdenReconstructorManager extends AbstractNpcAI @Override public String onSpawn(L2Npc npc) { - startQuestTimer("SPAM_TEXT", (5 * 60 * 1000), npc, null, true); + startQuestTimer("SPAM_TEXT", 5 * 60 * 1000, npc, null, true); return super.onSpawn(npc); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java index 453d54e026..f2179e30c7 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java +++ b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java @@ -40,7 +40,6 @@ final class ArcanRitual extends Quest private static final int BLUE_TRIGGER = 262001; private static final int RED_TRIGGER = 262003; private static final int ARCAN_RITUAL_INTERVAL = 30 * 60000; // 30 minutes - private static final boolean ENABLED = true; // In case we want to disable spawning NPCs private static final Location ARCAN_TOWN_LOC = new Location(207096, 88696, -1129); // @formatter:off static final int[][] RITUAL_NPCS = @@ -155,10 +154,7 @@ final class ArcanRitual extends Quest } addEnterZoneId(arcanZone.getId()); ritualStage = BLUE_TRIGGER; - if (ENABLED) - { - ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ChangeStage(), ARCAN_RITUAL_INTERVAL, ARCAN_RITUAL_INTERVAL); - } + ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ChangeStage(), ARCAN_RITUAL_INTERVAL, ARCAN_RITUAL_INTERVAL); } @Override diff --git a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java index 92e7427151..80233f9278 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java +++ b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java @@ -93,8 +93,6 @@ final class DenOfEvil extends AbstractNpcAI new Location(62905, -106109, -2384, 51288) }; - private final static boolean DEBUG = false; - private DenOfEvil() { super(DenOfEvil.class.getSimpleName(), "ai/group_template"); @@ -119,10 +117,6 @@ final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - if (DEBUG) - { - _log.warning("NPC " + npc + " spawned outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); - } return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -147,10 +141,6 @@ final class DenOfEvil extends AbstractNpcAI final L2EffectZone zone = ZoneManager.getInstance().getZone(npc, L2EffectZone.class); if (zone == null) { - if (DEBUG) - { - _log.warning("NPC " + npc + " killed outside of L2EffectZone, check your zone coords! X:" + npc.getX() + " Y:" + npc.getY() + " Z:" + npc.getZ()); - } return null; } final int skillId = getSkillIdByNpcId(npc.getId()); @@ -210,12 +200,9 @@ final class DenOfEvil extends AbstractNpcAI { SkillData.getInstance().getSkill(6149, 1).applyEffects(character, character); } - else + else if (character.doDie(null) && character.isNpc() && Util.contains(EYE_IDS, ((L2Npc) character).getId())) // mobs die { - if (character.doDie(null) && character.isNpc() && Util.contains(EYE_IDS, ((L2Npc) character).getId())) // mobs die - { - ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(((L2Npc) character).getLocation()), 15000); - } + ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(((L2Npc) character).getLocation()), 15000); } } for (int i = SKILL_ID; i <= (SKILL_ID + 4); i = i + 2) diff --git a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java index dee4fa193c..14daa7107f 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java +++ b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java @@ -164,18 +164,15 @@ final class DragonValley extends AbstractNpcAI { spawnGhost(npc, attacker, isSummon, 1); } - else + else if ((npc.getCurrentHp() < (npc.getMaxHp() / 2)) && (getRandom(100) < 5) && npc.isScriptValue(0)) { - if ((npc.getCurrentHp() < (npc.getMaxHp() / 2)) && (getRandom(100) < 5) && npc.isScriptValue(0)) + npc.setScriptValue(1); + final int rnd = getRandom(3, 5); + for (int i = 0; i < rnd; i++) { - npc.setScriptValue(1); - final int rnd = getRandom(3, 5); - for (int i = 0; i < rnd; i++) - { - final L2Playable playable = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; - final L2Npc minion = addSpawn(DRAKOS_ASSASSIN, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), true, 0, true); - addAttackDesire(minion, playable); - } + final L2Playable playable = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; + final L2Npc minion = addSpawn(DRAKOS_ASSASSIN, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), true, 0, true); + addAttackDesire(minion, playable); } } return super.onAttack(npc, attacker, damage, isSummon); @@ -285,7 +282,7 @@ final class DragonValley extends AbstractNpcAI ghost1.getVariables().set("playable", attacker); addAttackDesire(ghost1, attacker); val++; - if ((val < 2) && (getRandomBoolean())) + if ((val < 2) && getRandomBoolean()) { final L2Npc ghost2 = addSpawn(WRATHFUL_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 20, npc.getHeading(), false, 0, false); addAttackDesire(ghost2, attacker); diff --git a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java index 600aefad16..40221f68cb 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java @@ -368,18 +368,15 @@ final class FeedableBeasts extends AbstractNpcAI nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 1, 0); } } + else // if not tamed, there is a small chance that have "mad cow" disease. + // that is a stronger-than-normal animal that attacks its feeder + if (getRandom(5) == 0) + { + nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 1); + } else { - // if not tamed, there is a small chance that have "mad cow" disease. - // that is a stronger-than-normal animal that attacks its feeder - if (getRandom(5) == 0) - { - nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 1); - } - else - { - nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 0); - } + nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 0); } } else @@ -464,7 +461,7 @@ final class FeedableBeasts extends AbstractNpcAI if (MAD_COW_POLYMORPH.containsKey(nextNpcId)) { - this.startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player); + startQuestTimer("polymorph Mad Cow", 10000, nextNpc, player); } // register the player in the feedinfo for the mob that just spawned @@ -573,7 +570,7 @@ final class FeedableBeasts extends AbstractNpcAI } else if (Util.contains(TAMED_BEASTS, npcId) && (npc instanceof L2TamedBeastInstance)) { - final L2TamedBeastInstance beast = ((L2TamedBeastInstance) npc); + final L2TamedBeastInstance beast = (L2TamedBeastInstance) npc; if (skillId == beast.getFoodType()) { beast.onReceiveFood(); diff --git a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java index c058a9319b..9e53f28eb9 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java +++ b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java @@ -60,7 +60,7 @@ final class GiantsCave extends AbstractNpcAI for (L2Character characters : npc.getKnownList().getKnownCharactersInRadius(450)) { - if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean())) + if ((characters != null) && characters.isAttackable() && getRandomBoolean()) { addAttackDesire((L2Npc) characters, player); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java index 214b5d5e5a..157ce5c0eb 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java +++ b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java @@ -32,17 +32,17 @@ import ai.npc.AbstractNpcAI; final class LairOfAntharas extends AbstractNpcAI { // NPC - final private static int KNORIKS = 22857; - final private static int DRAGON_KNIGHT = 22844; - final private static int DRAGON_KNIGHT2 = 22845; - final private static int ELITE_DRAGON_KNIGHT = 22846; + private static final int KNORIKS = 22857; + private static final int DRAGON_KNIGHT = 22844; + private static final int DRAGON_KNIGHT2 = 22845; + private static final int ELITE_DRAGON_KNIGHT = 22846; - final private static int DRAGON_GUARD = 22852; - final private static int DRAGON_MAGE = 22853; + private static final int DRAGON_GUARD = 22852; + private static final int DRAGON_MAGE = 22853; // Misc - final private static int KNIGHT_CHANCE = 30; - final private static int KNORIKS_CHANCE = 60; - final private static int KNORIKS_CHANCE2 = 50; + private static final int KNIGHT_CHANCE = 30; + private static final int KNORIKS_CHANCE = 60; + private static final int KNORIKS_CHANCE2 = 50; private LairOfAntharas() { diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java index 549b12a11b..2f6d7ec1aa 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java @@ -138,7 +138,7 @@ final class PrimevalIsle extends AbstractNpcAI if (skill.getId() == SELFBUFF1.getSkillId()) { npc.setScriptValue(3); - if ((target != null)) + if (target != null) { npc.setTarget(target); addAttackDesire(npc, player); @@ -150,7 +150,7 @@ final class PrimevalIsle extends AbstractNpcAI if (skill.getId() == SELFBUFF1.getSkillId()) { npc.setScriptValue(1); - if ((target != null)) + if (target != null) { npc.setTarget(target); addAttackDesire(npc, player); @@ -159,7 +159,7 @@ final class PrimevalIsle extends AbstractNpcAI else if (skill.getId() == SELFBUFF2.getSkillId()) { npc.setScriptValue(5); - if ((target != null)) + if (target != null) { npc.setTarget(target); addAttackDesire(npc, player); @@ -179,7 +179,7 @@ final class PrimevalIsle extends AbstractNpcAI { if ((npc != null) && !npc.isDead()) { - npc.doCast((npc.getId() == SPRIGNANT[0] ? ANESTHESIA.getSkill() : DEADLY_POISON.getSkill())); + npc.doCast(npc.getId() == SPRIGNANT[0] ? ANESTHESIA.getSkill() : DEADLY_POISON.getSkill()); startQuestTimer("USE_SKILL", 15000, npc, null); } break; @@ -320,9 +320,9 @@ final class PrimevalIsle extends AbstractNpcAI final L2Playable playable = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker; for (L2Character characters : npc.getKnownList().getKnownCharactersInRadius(500)) { - if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean())) + if ((characters != null) && characters.isAttackable() && getRandomBoolean()) { - addAttackDesire(((L2Attackable) characters), playable); + addAttackDesire((L2Attackable) characters, playable); } } } @@ -349,7 +349,7 @@ final class PrimevalIsle extends AbstractNpcAI } } } - else if ((((npc.getCurrentHp() / npc.getMaxHp()) * 100) <= 60) && (npc.isScriptValue(3))) + else if ((((npc.getCurrentHp() / npc.getMaxHp()) * 100) <= 60) && npc.isScriptValue(3)) { if (!npc.isSkillDisabled(SELFBUFF1.getSkill())) { diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java index ffaefc709d..b3b1ee2a86 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java @@ -92,14 +92,11 @@ final class PrisonGuards extends AbstractNpcAI broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.IT_S_NOT_EASY_TO_OBTAIN); } } - else + else if (!player.isAffectedBySkill(TIMER) && (npc.calculateDistance(npc.getSpawn().getLocation(), false, false) < 2000)) { - if (!player.isAffectedBySkill(TIMER) && (npc.calculateDistance(npc.getSpawn().getLocation(), false, false) < 2000)) - { - npc.setTarget(player); - npc.doCast(STONE.getSkill()); - broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.YOU_RE_OUT_OF_YOUR_MIND_COMING_HERE); - } + npc.setTarget(player); + npc.doCast(STONE.getSkill()); + broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.YOU_RE_OUT_OF_YOUR_MIND_COMING_HERE); } return super.onAttack(npc, player, damage, isSummon); } diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java index e3ac958be5..ae6003792c 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java @@ -206,12 +206,12 @@ final class SelMahumDrill extends AbstractNpcAI // group hate for (L2Character ch : npc.getKnownList().getKnownCharacters()) { - if (!ch.isInCombat() && ch.isMonster() && (((L2Npc) ch).getSpawn().getName().equals(npc.getSpawn().getName()))) + if (!ch.isInCombat() && ch.isMonster() && ((L2Npc) ch).getSpawn().getName().equals(npc.getSpawn().getName())) { addAttackDesire((L2Npc) ch, attacker); } } - if ((getRandom(10) < 1) && (Util.contains(MAHUM_SOLDIERS, npc.getId()))) + if ((getRandom(10) < 1) && Util.contains(MAHUM_SOLDIERS, npc.getId())) { npc.broadcastEvent("ATTACKED", 1000, null); } @@ -317,7 +317,7 @@ final class SelMahumDrill extends AbstractNpcAI final int remainedCount = npc.getVariables().getInt("SOCIAL_ACTION_REMAINED_COUNT"); if (remainedCount > 0) { - npc.getVariables().set("SOCIAL_ACTION_REMAINED_COUNT", (remainedCount - 1)); + npc.getVariables().set("SOCIAL_ACTION_REMAINED_COUNT", remainedCount - 1); startQuestTimer("do_social_action", action.getRepeatInterval(), npc, null); } } diff --git a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java index e03f0de828..91f1c92054 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java @@ -159,7 +159,7 @@ final class SilentValley extends AbstractNpcAI { if (creature.isPlayable()) { - final L2PcInstance player = (isSummon) ? ((L2Summon) creature).getOwner() : creature.getActingPlayer(); + final L2PcInstance player = isSummon ? ((L2Summon) creature).getOwner() : creature.getActingPlayer(); if ((npc.getId() == GUARD1) || (npc.getId() == GUARD2)) { npc.setTarget(player); diff --git a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java index f8ee5536ce..6e15a6a588 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java +++ b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java @@ -245,7 +245,7 @@ final class StakatoNest extends AbstractNpcAI private static void giveCocoon(L2PcInstance player, L2Npc npc) { - player.addItem("StakatoCocoon", ((getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON), 1, npc, true); + player.addItem("StakatoCocoon", (getRandom(100) > 80) ? LARGE_COCOON : SMALL_COCOON, 1, npc, true); } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java index 3d6cc574be..d8031e21c5 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java +++ b/trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java @@ -214,8 +214,8 @@ public final class Antharas extends AbstractNpcAI { final L2Party party = player.getParty(); final boolean isInCC = party.isInCommandChannel(); - final List members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers(); - final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player); + final List members = isInCC ? party.getCommandChannel().getMembers() : party.getMembers(); + final boolean isPartyLeader = isInCC ? party.getCommandChannel().isLeader(player) : party.isLeader(player); if (!isPartyLeader) { htmltext = "13001-05.html"; @@ -244,20 +244,17 @@ public final class Antharas extends AbstractNpcAI } } } + else if (!hasQuestItems(player, STONE)) + { + htmltext = "13001-03.html"; + } else { - if (!hasQuestItems(player, STONE)) + player.teleToLocation(179700 + getRandom(700), 113800 + getRandom(2100), -7709); + if (getStatus() != WAITING) { - htmltext = "13001-03.html"; - } - else - { - player.teleToLocation(179700 + getRandom(700), 113800 + getRandom(2100), -7709); - if (getStatus() != WAITING) - { - setStatus(WAITING); - startQuestTimer("SPAWN_ANTHARAS", Config.ANTHARAS_WAIT_TIME * 60000, null, null); - } + setStatus(WAITING); + startQuestTimer("SPAWN_ANTHARAS", Config.ANTHARAS_WAIT_TIME * 60000, null, null); } } return htmltext; @@ -418,7 +415,7 @@ public final class Antharas extends AbstractNpcAI addSpawn(BEHEMOTH, npc, true); addSpawn(TERASQUE, npc, true); } - _minionCount += (minionMultipler * 2); + _minionCount += minionMultipler * 2; } else if (_minionCount < 98) { @@ -428,7 +425,7 @@ public final class Antharas extends AbstractNpcAI } else if (_minionCount < 99) { - addSpawn((getRandomBoolean() ? BEHEMOTH : TERASQUE), npc, true); + addSpawn(getRandomBoolean() ? BEHEMOTH : TERASQUE, npc, true); _minionCount++; } @@ -641,23 +638,23 @@ public final class Antharas extends AbstractNpcAI if (skill == null) { - refreshAiParams(attacker, (damage * 1000)); + refreshAiParams(attacker, damage * 1000); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) { - refreshAiParams(attacker, ((damage / 3) * 100)); + refreshAiParams(attacker, (damage / 3) * 100); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) { - refreshAiParams(attacker, (damage * 20)); + refreshAiParams(attacker, damage * 20); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) { - refreshAiParams(attacker, (damage * 10)); + refreshAiParams(attacker, damage * 10); } else { - refreshAiParams(attacker, ((damage / 3) * 20)); + refreshAiParams(attacker, (damage / 3) * 20); } manageSkills(npc); } @@ -761,7 +758,7 @@ public final class Antharas extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatsSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime); } private final void refreshAiParams(L2PcInstance attacker, int damage) diff --git a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java index 40b1d312ee..4ab924ffa4 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java +++ b/trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java @@ -492,23 +492,23 @@ public final class Baium extends AbstractNpcAI if (skill == null) { - refreshAiParams(attacker, npc, (damage * 1000)); + refreshAiParams(attacker, npc, damage * 1000); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.25)) { - refreshAiParams(attacker, npc, ((damage / 3) * 100)); + refreshAiParams(attacker, npc, (damage / 3) * 100); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) { - refreshAiParams(attacker, npc, (damage * 20)); + refreshAiParams(attacker, npc, damage * 20); } else if (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) { - refreshAiParams(attacker, npc, (damage * 10)); + refreshAiParams(attacker, npc, damage * 10); } else { - refreshAiParams(attacker, npc, ((damage / 3) * 20)); + refreshAiParams(attacker, npc, (damage / 3) * 20); } manageSkills(npc); } @@ -658,7 +658,7 @@ public final class Baium extends AbstractNpcAI private void setRespawn(long respawnTime) { - GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", (System.currentTimeMillis() + respawnTime)); + GrandBossManager.getInstance().getStatsSet(BAIUM).set("respawn_time", System.currentTimeMillis() + respawnTime); } private void manageSkills(L2Npc npc) @@ -672,7 +672,7 @@ public final class Baium extends AbstractNpcAI for (int i = 0; i < 3; i++) { final L2Character attacker = vars.getObject("c_quest" + i, L2Character.class); - if ((attacker == null) || ((npc.calculateDistance(attacker, true, false) > 9000) || attacker.isDead())) + if ((attacker == null) || (npc.calculateDistance(attacker, true, false) > 9000) || attacker.isDead()) { vars.set("i_quest" + i, 0); } diff --git a/trunk/dist/game/data/scripts/ai/individual/Beleth.java b/trunk/dist/game/data/scripts/ai/individual/Beleth.java index 6401ff976e..f8400c12f7 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Beleth.java +++ b/trunk/dist/game/data/scripts/ai/individual/Beleth.java @@ -108,7 +108,7 @@ final class Beleth extends AbstractNpcAI final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH); if (status == DEAD) { - final long time = (info.getLong("respawn_time") - System.currentTimeMillis()); + final long time = info.getLong("respawn_time") - System.currentTimeMillis(); if (time > 0) { startQuestTimer("BELETH_UNLOCK", time, null, null); @@ -634,7 +634,7 @@ final class Beleth extends AbstractNpcAI { npc.setTarget(player); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); - startQuestTimer("CAST", ((int) (((distance2 - 890) / (npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed())) * 1000)), npc, null); + startQuestTimer("CAST", (int) (((distance2 - 890) / (npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed())) * 1000), npc, null); } else if (distance2 < 890) { diff --git a/trunk/dist/game/data/scripts/ai/individual/Core.java b/trunk/dist/game/data/scripts/ai/individual/Core.java index 1e68821666..b7df69ddaf 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Core.java +++ b/trunk/dist/game/data/scripts/ai/individual/Core.java @@ -65,7 +65,7 @@ final class Core extends AbstractNpcAI final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD) { - final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { startQuestTimer("core_unlock", temp, null, null); @@ -194,7 +194,7 @@ final class Core extends AbstractNpcAI startQuestTimer("core_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE); - info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatsSet(CORE, info); startQuestTimer("despawn_minions", 20000, null, null); cancelQuestTimers("spawn_minion"); diff --git a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java index 9a72eaf0a5..06e13730d7 100644 --- a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java +++ b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java @@ -85,19 +85,19 @@ final class DarkWaterDragon extends AbstractNpcAI } else if (event.equalsIgnoreCase("1")) // spawns a detractor { - addSpawn(DETRACTOR1, (npc.getX() + 100), (npc.getY() + 100), npc.getZ(), 0, false, 40000); + addSpawn(DETRACTOR1, npc.getX() + 100, npc.getY() + 100, npc.getZ(), 0, false, 40000); } else if (event.equalsIgnoreCase("2")) // spawns a detractor { - addSpawn(DETRACTOR2, (npc.getX() + 100), (npc.getY() - 100), npc.getZ(), 0, false, 40000); + addSpawn(DETRACTOR2, npc.getX() + 100, npc.getY() - 100, npc.getZ(), 0, false, 40000); } else if (event.equalsIgnoreCase("3")) // spawns a detractor { - addSpawn(DETRACTOR1, (npc.getX() - 100), (npc.getY() + 100), npc.getZ(), 0, false, 40000); + addSpawn(DETRACTOR1, npc.getX() - 100, npc.getY() + 100, npc.getZ(), 0, false, 40000); } else if (event.equalsIgnoreCase("4")) // spawns a detractor { - addSpawn(DETRACTOR2, (npc.getX() - 100), (npc.getY() - 100), npc.getZ(), 0, false, 40000); + addSpawn(DETRACTOR2, npc.getX() - 100, npc.getY() - 100, npc.getZ(), 0, false, 40000); } else if (event.equalsIgnoreCase("fafurion_despawn")) // Fafurion Kindred disappears and drops reward { @@ -156,7 +156,7 @@ final class DarkWaterDragon extends AbstractNpcAI spawnShade(originalAttacker, SHADE2, npc.getX() - 100, npc.getY() - 100, npc.getZ()); spawnShade(originalAttacker, SHADE1, npc.getX() - 150, npc.getY() + 150, npc.getZ()); } - else if ((npc.getCurrentHp() < (npc.getMaxHp() / 2.0)) && !(SECOND_SPAWN.contains(npcObjId))) + else if ((npc.getCurrentHp() < (npc.getMaxHp() / 2.0)) && !SECOND_SPAWN.contains(npcObjId)) { SECOND_SPAWN.add(npcObjId); // Spawn second 5 shades on half hp of on Dark Water Dragon diff --git a/trunk/dist/game/data/scripts/ai/individual/Devno.java b/trunk/dist/game/data/scripts/ai/individual/Devno.java index 8f6f81d2ec..7bb0d8fc4c 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Devno.java +++ b/trunk/dist/game/data/scripts/ai/individual/Devno.java @@ -39,7 +39,7 @@ final class Devno extends AbstractNpcAI NpcStringId.I_SEE_THAT_ADVENTURERS_ARE_RETURNING_TO_TALKING_ISLAND_FOR_THE_AWAKENING, NpcStringId.YOU_CAN_SEE_VARIOUS_STATISTICS_IN_THE_MUSEUM_STATS_IN_THE_MAIN_MENU }; - private final static Location[] DEVNO_LOC = + private static final Location[] DEVNO_LOC = { new Location(-114448, 259106, -1203), new Location(-114565, 258686, -1203), diff --git a/trunk/dist/game/data/scripts/ai/individual/Eleve.java b/trunk/dist/game/data/scripts/ai/individual/Eleve.java index 39df89d30d..4b10c5754c 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Eleve.java +++ b/trunk/dist/game/data/scripts/ai/individual/Eleve.java @@ -38,7 +38,7 @@ final class Eleve extends AbstractNpcAI NpcStringId.DON_T_KNOW_WHAT_TO_DO_LOOK_AT_THE_MAP, NpcStringId.DO_YOU_SEE_A_SCROLL_ICON_GO_THAT_LOCATION }; - private final static Location[] ELEVE_LOC = + private static final Location[] ELEVE_LOC = { new Location(-114936, 259918, -1203), new Location(-114687, 259872, -1203), diff --git a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java index ca39cbefaa..a940e335e8 100644 --- a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java +++ b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java @@ -122,7 +122,7 @@ final class FrightenedRagnaOrc extends AbstractNpcAI } else { - broadcastNpcSay(npc, ChatType.NPC_GENERAL, (getRandomBoolean() ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10_000_000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOU_RE_PRETTY_DUMB_TO_BELIEVE_ME)); + broadcastNpcSay(npc, ChatType.NPC_GENERAL, getRandomBoolean() ? NpcStringId.THANKS_BUT_THAT_THING_ABOUT_10_000_000_ADENA_WAS_A_LIE_SEE_YA : NpcStringId.YOU_RE_PRETTY_DUMB_TO_BELIEVE_ME); } startQuestTimer("despawn", 1000, npc, null); } diff --git a/trunk/dist/game/data/scripts/ai/individual/Karonf.java b/trunk/dist/game/data/scripts/ai/individual/Karonf.java index 7ae5ffce74..563cf3fb8f 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Karonf.java +++ b/trunk/dist/game/data/scripts/ai/individual/Karonf.java @@ -38,7 +38,7 @@ final class Karonf extends AbstractNpcAI NpcStringId.WHEN_YOU_GO_TO_THE_MUSEUM_SPEAK_TO_PANTHEON, NpcStringId.SOME_FOLKS_DON_T_KNOW_WHAT_THEY_ARE_DOING }; - private final static Location[] KARONF_LOC = + private static final Location[] KARONF_LOC = { new Location(-113984, 259782, -1203), new Location(-113786, 259475, -1203), diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java index 9e1789eb71..1e4a102e21 100644 --- a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java +++ b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java @@ -306,12 +306,9 @@ final class QueenAnt extends AbstractNpcAI curse = CommonSkill.RAID_CURSE.getSkill(); } } - else + else if (!character.isParalyzed() && (getRandom(4) == 0)) { - if (!character.isParalyzed() && (getRandom(4) == 0)) - { - curse = CommonSkill.RAID_CURSE2.getSkill(); - } + curse = CommonSkill.RAID_CURSE2.getSkill(); } if (curse != null) @@ -360,7 +357,7 @@ final class QueenAnt extends AbstractNpcAI { if (((L2MonsterInstance) npc).getLeader() != null) { - ((L2MonsterInstance) npc).getLeader().getMinionList().onMinionDie(((L2MonsterInstance) npc), (280 + getRandom(40)) * 1000); + ((L2MonsterInstance) npc).getLeader().getMinionList().onMinionDie((L2MonsterInstance) npc, (280 + getRandom(40)) * 1000); } } else if (npcId == NURSE) @@ -391,13 +388,10 @@ final class QueenAnt extends AbstractNpcAI _task.cancel(false); _task = null; } - else + else if (_queen.calculateDistance(QUEEN_X, QUEEN_Y, QUEEN_Z, false, false) > 2000.) { - if (_queen.calculateDistance(QUEEN_X, QUEEN_Y, QUEEN_Z, false, false) > 2000.) - { - _queen.clearAggroList(); - _queen.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(QUEEN_X, QUEEN_Y, QUEEN_Z, 0)); - } + _queen.clearAggroList(); + _queen.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(QUEEN_X, QUEEN_Y, QUEEN_Z, 0)); } } } diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java index 6e1c7ee46f..2726045525 100644 --- a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java +++ b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java @@ -87,7 +87,7 @@ final class QueenShyeed extends AbstractNpcAI private void spawnShyeed() { final String respawn = loadGlobalQuestVar("Respawn"); - final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; if (remain > 0) { startQuestTimer("respawn", remain, null, null); diff --git a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java index 1dcba5a52b..b299349b09 100644 --- a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java +++ b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java @@ -178,7 +178,7 @@ final class ScarletVanHalisha extends AbstractNpcAI Skill skill = _skill; if (skill == null) { - skill = (getRndSkills(npc)); + skill = getRndSkills(npc); } if (npc.isPhysicalMuted()) @@ -222,7 +222,7 @@ final class ScarletVanHalisha extends AbstractNpcAI continue; } - if (((((L2Character) obj).getZ() < (npc.getZ() - 100)) && (((L2Character) obj).getZ() > (npc.getZ() + 100))) || !(GeoData.getInstance().canSeeTarget(((L2Character) obj).getX(), ((L2Character) obj).getY(), ((L2Character) obj).getZ(), npc.getX(), npc.getY(), npc.getZ()))) + if (((((L2Character) obj).getZ() < (npc.getZ() - 100)) && (((L2Character) obj).getZ() > (npc.getZ() + 100))) || !GeoData.getInstance().canSeeTarget(((L2Character) obj).getX(), ((L2Character) obj).getY(), ((L2Character) obj).getZ(), npc.getX(), npc.getY(), npc.getZ())) { continue; } diff --git a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java index ed33655504..6be9d4a1d7 100644 --- a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java +++ b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java @@ -71,7 +71,7 @@ final class SinWardens extends AbstractNpcAI int killedCount = killedMinionsCount.containsKey(master.getObjectId()) ? killedMinionsCount.get(master.getObjectId()) : 0; killedCount++; - if ((killedCount) == 5) + if (killedCount == 5) { master.broadcastPacket(new NpcSay(master.getObjectId(), ChatType.NPC_GENERAL, master.getId(), NpcStringId.WE_MIGHT_NEED_NEW_SLAVES_I_LL_BE_BACK_SOON_SO_WAIT)); master.doDie(killer); diff --git a/trunk/dist/game/data/scripts/ai/individual/Valakas.java b/trunk/dist/game/data/scripts/ai/individual/Valakas.java index 8d148535e7..1634a949ff 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Valakas.java +++ b/trunk/dist/game/data/scripts/ai/individual/Valakas.java @@ -127,7 +127,7 @@ public final class Valakas extends AbstractNpcAI if (status == DEAD) { // load the unlock date and time for valakas from DB - final long temp = (info.getLong("respawn_time") - System.currentTimeMillis()); + final long temp = info.getLong("respawn_time") - System.currentTimeMillis(); if (temp > 0) { // The time has not yet expired. Mark Valakas as currently locked (dead). @@ -178,7 +178,7 @@ public final class Valakas extends AbstractNpcAI // Start timer to lock entry after 30 minutes if (status == WAITING) { - startQuestTimer("beginning", (Config.VALAKAS_WAIT_TIME * 60000), valakas, null); + startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null); } } } @@ -356,18 +356,15 @@ public final class Valakas extends AbstractNpcAI callSkillAI(npc); } } - else + else if (event.equalsIgnoreCase("valakas_unlock")) { - if (event.equalsIgnoreCase("valakas_unlock")) - { - final L2Npc valakas = addSpawn(VALAKAS, -105200, -253104, -15264, 32768, false, 0); - GrandBossManager.getInstance().addBoss((L2GrandBossInstance) valakas); - GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT); - } - else if (event.equalsIgnoreCase("remove_players")) - { - ZONE.oustAllPlayers(); - } + final L2Npc valakas = addSpawn(VALAKAS, -105200, -253104, -15264, 32768, false, 0); + GrandBossManager.getInstance().addBoss((L2GrandBossInstance) valakas); + GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT); + } + else if (event.equalsIgnoreCase("remove_players")) + { + ZONE.oustAllPlayers(); } return super.onAdvEvent(event, npc, player); } @@ -436,7 +433,7 @@ public final class Valakas extends AbstractNpcAI startQuestTimer("valakas_unlock", respawnTime, null, null); // also save the respawn time so that the info is maintained past reboots final StatsSet info = GrandBossManager.getInstance().getStatsSet(VALAKAS); - info.set("respawn_time", (System.currentTimeMillis() + respawnTime)); + info.set("respawn_time", System.currentTimeMillis() + respawnTime); GrandBossManager.getInstance().setStatsSet(VALAKAS, info); return super.onKill(npc, killer, isSummon); @@ -456,7 +453,7 @@ public final class Valakas extends AbstractNpcAI } // Pickup a target if no or dead victim. 10% luck he decides to reconsiders his target. - if ((_actualVictim == null) || _actualVictim.isDead() || !(npc.getKnownList().knowsObject(_actualVictim)) || (getRandom(10) == 0)) + if ((_actualVictim == null) || _actualVictim.isDead() || !npc.getKnownList().knowsObject(_actualVictim) || (getRandom(10) == 0)) { _actualVictim = getRandomTarget(npc); } @@ -550,7 +547,7 @@ public final class Valakas extends AbstractNpcAI } } - return (result.isEmpty()) ? null : result.get(getRandom(result.size())); + return result.isEmpty() ? null : result.get(getRandom(result.size())); } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java index 0d79703f46..416a9cdd06 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java +++ b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java @@ -241,7 +241,7 @@ final class Alarm extends AbstractNpcAI * @param memoState the memo state, if memo state is less than zero, only quest state is checked * @return {@code true} if the player has the memo state, {@code false} otherwise */ - private static final boolean verifyMemoState(L2PcInstance player, int questId, int memoState) + private static boolean verifyMemoState(L2PcInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -266,7 +266,7 @@ final class Alarm extends AbstractNpcAI * @param questId the quest ID * @param memoState the memo state */ - private static final void setMemoState(L2PcInstance player, int questId, int memoState) + private static void setMemoState(L2PcInstance player, int questId, int memoState) { QuestState qs = null; switch (questId) @@ -295,7 +295,7 @@ final class Alarm extends AbstractNpcAI * @param slot the slot * @return the memo state ex */ - private static final int getMemoStateEx(L2PcInstance player, int questId, int slot) + private static int getMemoStateEx(L2PcInstance player, int questId, int slot) { QuestState qs = null; switch (questId) @@ -321,7 +321,7 @@ final class Alarm extends AbstractNpcAI * @param slot the slot * @param memoStateEx the memo state ex */ - private static final void setMemoStateEx(L2PcInstance player, int questId, int slot, int memoStateEx) + private static void setMemoStateEx(L2PcInstance player, int questId, int slot, int memoStateEx) { QuestState qs = null; switch (questId) diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java index cb6a96d59a..0acf94128e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java +++ b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java @@ -58,16 +58,16 @@ public final class AwakeningMaster extends AbstractNpcAI private static final int AEORE_MASTER = 33404; // Items private static final int SCROLL_OF_AFTERLIFE = 17600; - private final static int ABELIUS_POWER = 32264; - private final static int SAPYROS_POWER = 32265; - private final static int ASHAGEN_POWER = 32266; - private final static int CRANIGG_POWER = 32267; - private final static int SOLTKREIG_POWER = 32268; - private final static int NAVIAROPE_POWER = 32269; - private final static int LEISTER_POWER = 32270; - private final static int LAKCIS_POWER = 32271; + private static final int ABELIUS_POWER = 32264; + private static final int SAPYROS_POWER = 32265; + private static final int ASHAGEN_POWER = 32266; + private static final int CRANIGG_POWER = 32267; + private static final int SOLTKREIG_POWER = 32268; + private static final int NAVIAROPE_POWER = 32269; + private static final int LEISTER_POWER = 32270; + private static final int LAKCIS_POWER = 32271; // Other - private final static int AWAKENING_END_USM_ID = 10; + private static final int AWAKENING_END_USM_ID = 10; private AwakeningMaster() { diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java index 6a338f7f53..5fe6d7dcf7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java +++ b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java @@ -56,7 +56,7 @@ final class BlackJudge extends AbstractNpcAI public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { String htmltext = null; - final int level = ((player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5); + final int level = (player.getExpertiseLevel() < 5) ? player.getExpertiseLevel() : 5; switch (event) { case "remove_info": diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java index 56cc5e2eda..6188fd97e1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java @@ -140,7 +140,7 @@ final class CastleAmbassador extends AbstractNpcAI if (player.isClanLeader() && (player.getClanId() == fortOwner)) { - htmltext = (fortresss.isBorderFortress()) ? "ambassador-01.html" : "ambassador.html"; + htmltext = fortresss.isBorderFortress() ? "ambassador-01.html" : "ambassador.html"; } else { diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java index 564090335f..8927132bb4 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java @@ -65,7 +65,7 @@ final class CastleBlacksmith extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return (hasRights(player, npc)) ? npc.getId() + "-01.html" : "no.html"; + return hasRights(player, npc) ? npc.getId() + "-01.html" : "no.html"; } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java index 79678e33bc..86df3014f8 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java @@ -725,7 +725,7 @@ final class CastleChamberlain extends AbstractNpcAI { if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) { - final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; + final long amount = st.hasMoreTokens() ? Long.parseLong(st.nextToken()) : 0; if ((amount > 0) && (amount < Inventory.MAX_ADENA)) { if (player.getAdena() >= amount) @@ -750,10 +750,10 @@ final class CastleChamberlain extends AbstractNpcAI { if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_TAXES)) { - final long amount = (st.hasMoreTokens()) ? Long.parseLong(st.nextToken()) : 0; + final long amount = st.hasMoreTokens() ? Long.parseLong(st.nextToken()) : 0; if (amount <= castle.getTreasury()) { - castle.addToTreasuryNoTax((-1) * amount); + castle.addToTreasuryNoTax(-1 * amount); giveAdena(player, amount, false); htmltext = "chamberlain-01.html"; } @@ -851,12 +851,12 @@ final class CastleChamberlain extends AbstractNpcAI } else { - final boolean open = (Integer.parseInt(st.nextToken()) == 1); + final boolean open = Integer.parseInt(st.nextToken()) == 1; while (st.hasMoreTokens()) { castle.openCloseDoor(player, Integer.parseInt(st.nextToken()), open); } - htmltext = (open ? "chamberlain-05.html" : "chamberlain-06.html"); + htmltext = open ? "chamberlain-05.html" : "chamberlain-06.html"; } break; } @@ -972,13 +972,13 @@ final class CastleChamberlain extends AbstractNpcAI { htmltext = "chamberlain-21.html"; } - else if (castle.getFunction(Castle.FUNC_TELEPORT) == null) + else if (castle.getFunction(Castle.FUNC_TELEPORT) != null) { - htmltext = "castlefuncdisabled.html"; + htmltext = npc.getCastle().getName() + "-t" + castle.getFunction(Castle.FUNC_TELEPORT).getLvl() + ".html"; } else { - htmltext = npc.getCastle().getName() + "-t" + castle.getFunction(Castle.FUNC_TELEPORT).getLvl() + ".html"; + htmltext = "castlefuncdisabled.html"; } break; } @@ -1164,7 +1164,7 @@ final class CastleChamberlain extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return (isOwner(player, npc)) ? "chamberlain-01.html" : "chamberlain-04.html"; + return isOwner(player, npc) ? "chamberlain-01.html" : "chamberlain-04.html"; } // @formatter:off diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java index fff2311791..6b815c411c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java @@ -68,16 +68,13 @@ final class CastleSiegeManager extends AbstractNpcAI { htmltext = "CastleSiegeManager-02.html"; } + else if (npc.getConquerableHall() != null) + { + npc.getConquerableHall().showSiegeInfo(player); + } else { - if (npc.getConquerableHall() != null) - { - npc.getConquerableHall().showSiegeInfo(player); - } - else - { - npc.getCastle().getSiege().listRegisterClan(player); - } + npc.getCastle().getSiege().listRegisterClan(player); } return htmltext; } diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java index f332943a53..0af8f806e3 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java @@ -92,7 +92,7 @@ final class CastleTeleporter extends AbstractNpcAI public String onFirstTalk(L2Npc npc, L2PcInstance player) { final Siege siege = npc.getCastle().getSiege(); - return (npc.isScriptValue(0)) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "teleporter-02.html" : "teleporter-01.html" : "teleporter-03.html"; + return npc.isScriptValue(0) ? (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? "teleporter-02.html" : "teleporter-01.html" : "teleporter-03.html"; } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java index 59f230fe75..a29d8a28d9 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java @@ -66,7 +66,7 @@ final class CastleWarehouse extends AbstractNpcAI } case "warehouse-04.html": { - htmltext = (!npc.isMyLord(player)) ? "warehouse-no.html" : getHtm(player.getHtmlPrefix(), "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount())); + htmltext = !npc.isMyLord(player) ? "warehouse-no.html" : getHtm(player.getHtmlPrefix(), "warehouse-04.html").replace("%blood%", Integer.toString(player.getClan().getBloodAllianceCount())); break; } case "Receive": diff --git a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java index 02b941962a..9cf432bf54 100644 --- a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java +++ b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java @@ -119,7 +119,7 @@ final class DragonVortex extends AbstractNpcAI if (!unspawnedRaids.isEmpty()) { final int unspawnedRaidsSize = unspawnedRaids.size(); - final int chanceIncrease = (raidChanceIncrease / unspawnedRaidsSize); + final int chanceIncrease = raidChanceIncrease / unspawnedRaidsSize; int raidChanceValue = 0; for (int[] unspawnedRaidsList : unspawnedRaids) @@ -172,7 +172,7 @@ final class DragonVortex extends AbstractNpcAI for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId)) { final L2Npc spawnedWarpgate = spawn.getLastSpawn(); - if ((spawnedWarpgate != null)) + if (spawnedWarpgate != null) { return true; } diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java index b448571813..9cf96bfa4e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java +++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java @@ -135,33 +135,29 @@ final class ForgeOfTheGods extends AbstractNpcAI mob = spawnLavasaurus(npc, rand, LAVASAURUSES[2], LAVASAURUSES[1]); } } - else - // if (_npcsAlive < 32) + else if ((_npcCount > BONUS_UPPER_LV05) && (rand <= FORGE_BONUS02)) { - if ((_npcCount > BONUS_UPPER_LV05) && (rand <= FORGE_BONUS02)) - { - mob = addSpawn(LAVASAURUSES[1], npc, true); - } - else if (_npcCount > BONUS_UPPER_LV04) - { - mob = spawnLavasaurus(npc, rand, LAVASAURUSES[4], LAVASAURUSES[3]); - } - else if (_npcCount > BONUS_UPPER_LV03) - { - mob = spawnLavasaurus(npc, rand, LAVASAURUSES[3], LAVASAURUSES[2]); - } - else if (_npcCount > BONUS_UPPER_LV02) - { - mob = spawnLavasaurus(npc, rand, LAVASAURUSES[2], LAVASAURUSES[1]); - } - else if (_npcCount > BONUS_UPPER_LV01) - { - mob = spawnLavasaurus(npc, rand, LAVASAURUSES[1], LAVASAURUSES[0]); - } - else if ((_npcCount >= MOBCOUNT_BONUS_MIN) && (rand <= FORGE_BONUS01)) - { - mob = addSpawn(LAVASAURUSES[0], npc, true); - } + mob = addSpawn(LAVASAURUSES[1], npc, true); + } + else if (_npcCount > BONUS_UPPER_LV04) + { + mob = spawnLavasaurus(npc, rand, LAVASAURUSES[4], LAVASAURUSES[3]); + } + else if (_npcCount > BONUS_UPPER_LV03) + { + mob = spawnLavasaurus(npc, rand, LAVASAURUSES[3], LAVASAURUSES[2]); + } + else if (_npcCount > BONUS_UPPER_LV02) + { + mob = spawnLavasaurus(npc, rand, LAVASAURUSES[2], LAVASAURUSES[1]); + } + else if (_npcCount > BONUS_UPPER_LV01) + { + mob = spawnLavasaurus(npc, rand, LAVASAURUSES[1], LAVASAURUSES[0]); + } + else if ((_npcCount >= MOBCOUNT_BONUS_MIN) && (rand <= FORGE_BONUS01)) + { + mob = addSpawn(LAVASAURUSES[0], npc, true); } if (mob != null) { diff --git a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java index 55257ae43f..c6cb175546 100644 --- a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java @@ -106,7 +106,7 @@ final class FortressSiegeManager extends AbstractNpcAI { htmltext = "FortressSiegeManager-10.html"; } - else if ((clan.getLevel() < FortSiegeManager.getInstance().getSiegeClanMinLevel())) + else if (clan.getLevel() < FortSiegeManager.getInstance().getSiegeClanMinLevel()) { htmltext = "FortressSiegeManager-04.html"; } diff --git a/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java b/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java index f782063397..ec9abffce3 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java +++ b/trunk/dist/game/data/scripts/ai/npc/Hardin/Hardin.java @@ -51,7 +51,7 @@ final class Hardin extends AbstractNpcAI { htmltext = "33870-01.html"; } - else if ((player.getRace() != Race.ERTHEIA) && (CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId()))) + else if ((player.getRace() != Race.ERTHEIA) && CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId())) { htmltext = "33870-02.html"; } diff --git a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java index 618236b6b8..61e9aafae1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java +++ b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java @@ -102,7 +102,7 @@ final class KetraOrcSupport extends AbstractNpcAI { if (hasQuestItems(player, KETRA_MARKS[i])) { - return (i + 1); + return i + 1; } } return 0; diff --git a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java index 78596126a7..823421b027 100644 --- a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java +++ b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java @@ -112,7 +112,7 @@ final class LaVieEnRose extends AbstractNpcAI @Override public String onSpawn(L2Npc npc) { - startQuestTimer("SPAM_TEXT", (5 * 60 * 1000), npc, null, true); + startQuestTimer("SPAM_TEXT", 5 * 60 * 1000, npc, null, true); return super.onSpawn(npc); } diff --git a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java index eddd5e4e19..4ccf1ec51a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java +++ b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java @@ -71,7 +71,7 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader private static final int DIPLOMA = 33805; // Skills - private final static SkillHolder[] MENTEE_BUFFS = + private static final SkillHolder[] MENTEE_BUFFS = { new SkillHolder(9227, 1), // Mentor's Poem of Horn new SkillHolder(9228, 1), // Mentor's Poem of Drum diff --git a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java index dafbfb4ca1..810e607ad5 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java +++ b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java @@ -208,7 +208,7 @@ final class Minigame extends AbstractNpcAI if (npc.getTarget() == null) { - htmltext = (miniGameStarted ? "32758-08.html" : "32758.html"); + htmltext = miniGameStarted ? "32758-08.html" : "32758.html"; } else if (npc.getTarget() == talker) { @@ -291,23 +291,20 @@ final class Minigame extends AbstractNpcAI startQuestTimer("end", 4000, room.getManager(), null); } } - else + else if (room.getAttemptNumber() == MAX_ATTEMPTS) { - if (room.getAttemptNumber() == MAX_ATTEMPTS) - { - broadcastNpcSay(room.getManager(), ChatType.NPC_GENERAL, NpcStringId.I_VE_FAILED_ANY_FURTHER_ATTEMPTS_WOULD_BE_WASTEFUL); - room.burnThemAll(); - startQuestTimer("off", 2000, room.getManager(), null); - room.getParticipant().removeListenerIf(EventType.ON_CREATURE_SKILL_USE, listener -> listener.getOwner() == room); - startQuestTimer("end", 4000, room.getManager(), null); - } - else if (room.getAttemptNumber() < MAX_ATTEMPTS) - { - broadcastNpcSay(room.getManager(), ChatType.NPC_GENERAL, NpcStringId.TOO_BAD_I_WILL_NOT_GIVE_UP_ON_THIS_THOUGH); - room.burnThemAll(); - startQuestTimer("off", 2000, room.getManager(), null); - room.setAttemptNumber(room.getAttemptNumber() + 1); - } + broadcastNpcSay(room.getManager(), ChatType.NPC_GENERAL, NpcStringId.I_VE_FAILED_ANY_FURTHER_ATTEMPTS_WOULD_BE_WASTEFUL); + room.burnThemAll(); + startQuestTimer("off", 2000, room.getManager(), null); + room.getParticipant().removeListenerIf(EventType.ON_CREATURE_SKILL_USE, listener -> listener.getOwner() == room); + startQuestTimer("end", 4000, room.getManager(), null); + } + else if (room.getAttemptNumber() < MAX_ATTEMPTS) + { + broadcastNpcSay(room.getManager(), ChatType.NPC_GENERAL, NpcStringId.TOO_BAD_I_WILL_NOT_GIVE_UP_ON_THIS_THOUGH); + room.burnThemAll(); + startQuestTimer("off", 2000, room.getManager(), null); + room.setAttemptNumber(room.getAttemptNumber() + 1); } break; } diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java index 9e6f739ff2..94d52d9914 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java @@ -76,12 +76,9 @@ class NpcBufferAI implements Runnable } } } - else + else if (Util.checkIfInRange(skill.getAffectRange(), _npc, player, true) && !player.isDead()) { - if (Util.checkIfInRange(skill.getAffectRange(), _npc, player, true) && !player.isDead()) - { - skill.applyEffects(player, player); - } + skill.applyEffects(player, player); } break; } diff --git a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java index b5968ef86d..1093c51cbf 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java +++ b/trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java @@ -66,14 +66,14 @@ public final class Raina extends AbstractNpcAI private static final int RAINA = 33491; // Items private static final int SUBCLASS_CERTIFICATE = 30433; - private final static int ABELIUS_POWER = 32264; - private final static int SAPYROS_POWER = 32265; - private final static int ASHAGEN_POWER = 32266; - private final static int CRANIGG_POWER = 32267; - private final static int SOLTKREIG_POWER = 32268; - private final static int NAVIAROPE_POWER = 32269; - private final static int LEISTER_POWER = 32270; - private final static int LAKCIS_POWER = 32271; + private static final int ABELIUS_POWER = 32264; + private static final int SAPYROS_POWER = 32265; + private static final int ASHAGEN_POWER = 32266; + private static final int CRANIGG_POWER = 32267; + private static final int SOLTKREIG_POWER = 32268; + private static final int NAVIAROPE_POWER = 32269; + private static final int LEISTER_POWER = 32270; + private static final int LAKCIS_POWER = 32271; // Misc private static final Set mainSubclassSet; private static final Set neverSubclassed = EnumSet.of(PlayerClass.Overlord, PlayerClass.Warsmith); @@ -529,7 +529,7 @@ public final class Raina extends AbstractNpcAI case 5: // Reawaken (change dual class) { final int classId = event.getReply(); - if (player.isTransformed() || player.hasSummon() || (!player.hasDualClass() || !player.isDualClassActive() || (player.getClassId().level() != ClassLevel.AWAKEN.ordinal()))) + if (player.isTransformed() || player.hasSummon() || !player.hasDualClass() || !player.isDualClassActive() || (player.getClassId().level() != ClassLevel.AWAKEN.ordinal())) { break; } @@ -549,7 +549,7 @@ public final class Raina extends AbstractNpcAI break; } - player.reduceAdena((getClass().getSimpleName() + "_Reawaken"), REAWAKEN_PRICE[index], npc, true); + player.reduceAdena(getClass().getSimpleName() + "_Reawaken", REAWAKEN_PRICE[index], npc, true); takeItems(player, getCloakId(player), 1); final int classIndex = player.getClassIndex(); diff --git a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java index 4439ac8ff5..71889970d0 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java +++ b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java @@ -48,11 +48,11 @@ final class Sirra extends AbstractNpcAI if ((world != null) && (world.getTemplateId() == FREYA_INSTID)) { - return (world.isStatus(0)) ? "32762-easy.html" : "32762-easyfight.html"; + return world.isStatus(0) ? "32762-easy.html" : "32762-easyfight.html"; } else if ((world != null) && (world.getTemplateId() == FREYA_HARD_INSTID)) { - return (world.isStatus(0)) ? "32762-hard.html" : "32762-hardfight.html"; + return world.isStatus(0) ? "32762-hard.html" : "32762-hardfight.html"; } return "32762.html"; } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java index 43326911b7..ebc5ab8865 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java @@ -78,7 +78,7 @@ final class DelusionTeleport extends AbstractNpcAI if (npc.getId() == NPCS[0]) // Pathfinder Worker { final L2TownZone town = TownManager.getTown(npc.getX(), npc.getY(), npc.getZ()); - final int townId = ((town == null) ? 0 : town.getTownId()); + final int townId = (town == null) ? 0 : town.getTownId(); player.getVariables().set(DELUSION_RETURN, townId); player.teleToLocation(HALL_LOCATIONS[getRandom(HALL_LOCATIONS.length)], false); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java index 47e6f56515..77e822c3fa 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DimensionalWarpTeleport/DimensionalWarpTeleport.java @@ -28,14 +28,14 @@ import ai.npc.AbstractNpcAI; final class DimensionalWarpTeleport extends AbstractNpcAI { // NPC - private final static int RESED = 33974; + private static final int RESED = 33974; // Misc - private final static int MIN_LEVEL = 99; + private static final int MIN_LEVEL = 99; // Items - private final static int WARP_CRYSTAL = 39597; - private final static int WARP_CRYSTAL_COUNT = 3; + private static final int WARP_CRYSTAL = 39597; + private static final int WARP_CRYSTAL_COUNT = 3; // Location - private final static Location DIMENSIONAL_WARP = new Location(-76785, -217420, 4016); + private static final Location DIMENSIONAL_WARP = new Location(-76785, -217420, 4016); private DimensionalWarpTeleport() { @@ -47,7 +47,7 @@ final class DimensionalWarpTeleport extends AbstractNpcAI @Override public String onTalk(L2Npc npc, L2PcInstance player) { - if ((hasQuestItems(player, WARP_CRYSTAL)) && (player.getLevel() >= MIN_LEVEL) && (getQuestItemsCount(player, WARP_CRYSTAL) >= WARP_CRYSTAL_COUNT) && (player.isAwaken())) + if (hasQuestItems(player, WARP_CRYSTAL) && (player.getLevel() >= MIN_LEVEL) && (getQuestItemsCount(player, WARP_CRYSTAL) >= WARP_CRYSTAL_COUNT) && player.isAwaken()) { takeItems(player, WARP_CRYSTAL, 3); player.teleToLocation(DIMENSIONAL_WARP); diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java index 6a7fe53876..0b7f78e766 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/HarnakUnderground/HarnakUnderground.java @@ -28,11 +28,11 @@ import ai.npc.AbstractNpcAI; final class HarnakUnderground extends AbstractNpcAI { // NPC - private final static int HADEL = 33344; + private static final int HADEL = 33344; // Misc - private final static int MIN_LEVEL = 85; + private static final int MIN_LEVEL = 85; // Location - private final static Location HARNAK_UNDERGROUND = new Location(-114700, 147909, -7720); + private static final Location HARNAK_UNDERGROUND = new Location(-114700, 147909, -7720); private HarnakUnderground() { @@ -44,7 +44,7 @@ final class HarnakUnderground extends AbstractNpcAI @Override public String onTalk(L2Npc npc, L2PcInstance player) { - if ((player.getLevel() >= MIN_LEVEL) && (player.isAwaken())) + if ((player.getLevel() >= MIN_LEVEL) && player.isAwaken()) { player.teleToLocation(HARNAK_UNDERGROUND); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java index 9057fd7615..b56e3cdded 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/KargosTeleport/KargosTeleport.java @@ -28,13 +28,13 @@ import ai.npc.AbstractNpcAI; final class KargosTeleport extends AbstractNpcAI { // NPC - private final static int KARGOS = 33821; + private static final int KARGOS = 33821; // Items - private final static int PAGAN_MARK = 8067; - private final static int VISITOR_MARK = 8064; + private static final int PAGAN_MARK = 8067; + private static final int VISITOR_MARK = 8064; // Locations - private final static Location PAGAN_TEMPLE = new Location(-16350, -37579, -10725); - private final static Location PAGAN_ROOM = new Location(-12766, -35840, -10851); + private static final Location PAGAN_TEMPLE = new Location(-16350, -37579, -10725); + private static final Location PAGAN_ROOM = new Location(-12766, -35840, -10851); private KargosTeleport() { diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java index 9937ec5db3..1e7bf5476f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; final class MithrilMinesTeleporter extends AbstractNpcAI { // NPC - private final static int TELEPORT_CRYSTAL = 32652; + private static final int TELEPORT_CRYSTAL = 32652; // Location private static final Location[] LOCS = { diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java index 88779dc861..a13b991fda 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java @@ -31,7 +31,7 @@ import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust; final class StakatoNestTeleporter extends AbstractNpcAI { // Locations - private final static Location[] LOCS = + private static final Location[] LOCS = { new Location(80456, -52322, -5640), new Location(88718, -46214, -4640), @@ -40,7 +40,7 @@ final class StakatoNestTeleporter extends AbstractNpcAI new Location(87682, -43291, -4128) }; // NPC - private final static int KINTAIJIN = 32640; + private static final int KINTAIJIN = 32640; private StakatoNestTeleporter() { @@ -77,7 +77,7 @@ final class StakatoNestTeleporter extends AbstractNpcAI public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState accessQuest = player.getQuestState(Q00240_ImTheOnlyOneYouCanTrust.class.getSimpleName()); - return (((accessQuest != null) && accessQuest.isCompleted()) ? "32640.htm" : "32640-no.htm"); + return ((accessQuest != null) && accessQuest.isCompleted()) ? "32640.htm" : "32640-no.htm"; } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java index 55ad9c28e8..f9d4d1fa82 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; final class StrongholdsTeleports extends AbstractNpcAI { // NPCs - private final static int[] NPCs = + private static final int[] NPCs = { 32181, 32184, diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java index cfb1ca596e..bfd5b057b5 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java @@ -30,14 +30,14 @@ import ai.npc.AbstractNpcAI; final class TeleportWithCharm extends AbstractNpcAI { // NPCs - private final static int WHIRPY = 30540; - private final static int TAMIL = 30576; + private static final int WHIRPY = 30540; + private static final int TAMIL = 30576; // Items - private final static int ORC_GATEKEEPER_CHARM = 1658; - private final static int DWARF_GATEKEEPER_TOKEN = 1659; + private static final int ORC_GATEKEEPER_CHARM = 1658; + private static final int DWARF_GATEKEEPER_TOKEN = 1659; // Locations - private final static Location ORC_TELEPORT = new Location(-80826, 149775, -3043); - private final static Location DWARF_TELEPORT = new Location(-80826, 149775, -3043); + private static final Location ORC_TELEPORT = new Location(-80826, 149775, -3043); + private static final Location DWARF_TELEPORT = new Location(-80826, 149775, -3043); private TeleportWithCharm() { diff --git a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java index 913322c16e..bab441788e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java +++ b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java @@ -188,7 +188,7 @@ final class HealerTrainer extends AbstractNpcAI itemId = -1; } } - return (player.getInventory().getInventoryItemCount(itemId, -1) > 0); + return player.getInventory().getInventoryItemCount(itemId, -1) > 0; } public static void main(String[] args) diff --git a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java index bfd2e281b3..4f589dfa90 100644 --- a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -91,12 +91,9 @@ final class FirstClassTransferTalk extends AbstractNpcAI htmltext += "mystic.html"; } } - else + else if (npc instanceof L2VillageMasterFighterInstance) { - if (npc instanceof L2VillageMasterFighterInstance) - { - htmltext += "fighter.html"; - } + htmltext += "fighter.html"; } } else if (player.getClassId().level() == 1) diff --git a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java index 9a6f549c27..684e26ad53 100644 --- a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java @@ -284,23 +284,17 @@ final class WyvernManager extends AbstractNpcAI { htmltext = "wyvernmanager-02.html"; } + else if (Config.ALLOW_WYVERN_ALWAYS) + { + htmltext = replaceAll(npc, player.getHtmlPrefix()); + } + else if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE) + { + htmltext = "wyvernmanager-dusk.html"; + } else { - if (Config.ALLOW_WYVERN_ALWAYS) - { - htmltext = replaceAll(npc, player.getHtmlPrefix()); - } - else - { - if (MANAGERS.get(npc.getId()) == ManagerType.CASTLE) - { - htmltext = "wyvernmanager-dusk.html"; - } - else - { - htmltext = replaceAll(npc, player.getHtmlPrefix()); - } - } + htmltext = replaceAll(npc, player.getHtmlPrefix()); } return htmltext; } diff --git a/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java b/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java index d0a7e431c9..f68e645366 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java @@ -84,7 +84,7 @@ final class DevastatedCastle extends ClanHallSiegeEngine final int id = clan.getId(); if (_damageToGustav.containsKey(id)) { - _damageToGustav.put(id, (_damageToGustav.get(id) + damage)); + _damageToGustav.put(id, _damageToGustav.get(id) + damage); } else { diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java index 4d08175547..50f860eb96 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java @@ -117,7 +117,7 @@ final class FortressOfResistance extends ClanHallSiegeEngine final int clanId = player.getClanId(); if (clanId > 0) { - _damageToNurka.put(clanId, ((_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage)); + _damageToNurka.put(clanId, _damageToNurka.containsKey(clanId) ? _damageToNurka.get(clanId) + damage : damage); } return null; } diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java index 9c220ec117..6caa35c9ac 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java @@ -91,7 +91,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine final int id = clan.getId(); if ((id > 0) && _damageToLidia.containsKey(id)) { - _damageToLidia.put(id, (_damageToLidia.get(id) + damage)); + _damageToLidia.put(id, _damageToLidia.get(id) + damage); } else { @@ -156,7 +156,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine if ((hoursLeft < 0) || (hoursLeft > 6)) { cancelSiegeTask(); - _siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), ((24 - hoursLeft) * 10 * 60000)); + _siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), (24 - hoursLeft) * 10 * 60000); } else { diff --git a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index 54f597a2da..936556255d 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -805,7 +805,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine else { _usedTextPassages.put(_textPassages[randomPos], new ArrayList()); - npc.broadcastPacket((new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), _textPassages[randomPos]))); + npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), _textPassages[randomPos])); } } diff --git a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java index b2948a1240..d2b2a7e920 100644 --- a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java +++ b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java @@ -61,7 +61,7 @@ final class FactionManager extends AbstractNpcAI { case "selectGoodFaction": { - if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllGoodPlayersCount() >= ((L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) + if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllGoodPlayersCount() >= (L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))) { final String htmltext = null; final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); @@ -88,7 +88,7 @@ final class FactionManager extends AbstractNpcAI } case "selectEvilFaction": { - if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllEvilPlayersCount() >= ((L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) + if (Config.FACTION_BALANCE_ONLINE_PLAYERS && (L2World.getInstance().getAllEvilPlayersCount() >= (L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))) { final String htmltext = null; final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); diff --git a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 5c107f3a24..f5f66a6788 100644 --- a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -220,7 +220,7 @@ final class Elpies extends Event } } - private static final void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist) + private static void dropItem(L2Npc mob, L2PcInstance player, int[][] droplist) { final int chance = getRandom(100); diff --git a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java index 402a963531..bbe663d4c0 100644 --- a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java +++ b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java @@ -138,7 +138,7 @@ final class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler { final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId()); final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts(); - htmltext = getHtm(player.getHtmlPrefix(), (!isParticipant ? "Participation.html" : "RemoveParticipation.html")); + htmltext = getHtm(player.getHtmlPrefix(), !isParticipant ? "Participation.html" : "RemoveParticipation.html"); htmltext = htmltext.replaceAll("%objectId%", String.valueOf(npc.getObjectId())); htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME); htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0])); diff --git a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 49473b5964..9d7e03aa6b 100644 --- a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -31,7 +31,7 @@ final class CharacterBirthday extends Quest private static final int ALEGRIA = 32600; private static int SPAWNS = 0; - private final static int[] GK = + private static final int[] GK = { 30006, 30059, diff --git a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 57a7e19ac3..c1628ce3c6 100644 --- a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -131,12 +131,9 @@ final class FreyaCelebration extends LongTimeEvent caster.addItem("FreyaCelebration", FREYA_GIFT, 1, npc, true); } - else + else if (getRandom(10) < 2) { - if (getRandom(10) < 2) - { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), FREYA_TEXT[getRandom(FREYA_TEXT.length - 1)])); - } + npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), FREYA_TEXT[getRandom(FREYA_TEXT.length - 1)])); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 1b7d77b016..6bebe4f58f 100644 --- a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -123,7 +123,7 @@ final class GiftOfVitality extends LongTimeEvent } else { - final SkillHolder[] skills = (player.isMageClass()) ? MAGE_SKILLS : FIGHTER_SKILLS; + final SkillHolder[] skills = player.isMageClass() ? MAGE_SKILLS : FIGHTER_SKILLS; npc.setTarget(player); for (SkillHolder sk : skills) { diff --git a/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java index 07bfcc3f82..5759e2188a 100644 --- a/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java +++ b/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java @@ -27,20 +27,20 @@ import com.l2jmobius.gameserver.model.event.LongTimeEvent; */ final class HeavyMedal extends LongTimeEvent { - private final static int CAT_ROY = 31228; - private final static int CAT_WINNIE = 31229; - private final static int GLITTERING_MEDAL = 6393; + private static final int CAT_ROY = 31228; + private static final int CAT_WINNIE = 31229; + private static final int GLITTERING_MEDAL = 6393; - private final static int WIN_CHANCE = 50; + private static final int WIN_CHANCE = 50; - private final static int[] MEDALS = + private static final int[] MEDALS = { 5, 10, 20, 40 }; - private final static int[] BADGES = + private static final int[] BADGES = { 6399, 6400, diff --git a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index 52416d8fdc..8abf4564ac 100644 --- a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -134,21 +134,18 @@ final class MasterOfEnchanting extends LongTimeEvent player.sendPacket(sm); htmltext = "32599-scroll24.htm"; } + // Little glitch. There is no SystemMessage with seconds only. + // If time is less than 1 minute player can buy scrolls + else if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_24_PRICE) + { + takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE); + giveItems(player, MASTER_YOGI_SCROLL, 24); + saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); + htmltext = "32599-scroll24.htm"; + } else { - // Little glitch. There is no SystemMessage with seconds only. - // If time is less than 1 minute player can buy scrolls - if (getQuestItemsCount(player, Inventory.ADENA_ID) > SCROLL_24_PRICE) - { - takeItems(player, Inventory.ADENA_ID, SCROLL_24_PRICE); - giveItems(player, MASTER_YOGI_SCROLL, 24); - saveGlobalQuestVar(player.getAccountName(), Long.toString(System.currentTimeMillis() + (SCROLL_24_TIME * 3600000))); - htmltext = "32599-scroll24.htm"; - } - else - { - htmltext = "32599-s24-no.htm"; - } + htmltext = "32599-s24-no.htm"; } } } diff --git a/trunk/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java b/trunk/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java index b8148a3c68..a4c8dec27c 100644 --- a/trunk/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java +++ b/trunk/dist/game/data/scripts/events/ThePowerOfLove/ThePowerOfLove.java @@ -73,7 +73,7 @@ final class ThePowerOfLove extends LongTimeEvent } case "ct": { - if (!hasQuestItems(player, CT) && (!hasQuestItems(player, CH) && (!hasQuestItems(player, CC)))) + if (!hasQuestItems(player, CT) && !hasQuestItems(player, CH) && !hasQuestItems(player, CC)) { giveItems(player, CT, 1); giveItems(player, CT_TRANSORM, 1); @@ -88,7 +88,7 @@ final class ThePowerOfLove extends LongTimeEvent } case "ch": { - if (!hasQuestItems(player, CT) && (!hasQuestItems(player, CH) && (!hasQuestItems(player, CC)))) + if (!hasQuestItems(player, CT) && !hasQuestItems(player, CH) && !hasQuestItems(player, CC)) { giveItems(player, CH, 1); giveItems(player, CH_TRANSORM, 1); @@ -103,7 +103,7 @@ final class ThePowerOfLove extends LongTimeEvent } case "cc": { - if (!hasQuestItems(player, CT) && (!hasQuestItems(player, CH) && (!hasQuestItems(player, CC)))) + if (!hasQuestItems(player, CT) && !hasQuestItems(player, CH) && !hasQuestItems(player, CC)) { giveItems(player, CC, 1); giveItems(player, CC_TRANSORM, 1); diff --git a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java index bbe2469386..ff00bc53ef 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java +++ b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java @@ -177,14 +177,13 @@ public class EnergySeeds extends AbstractNpcAI return super.onSkillSee(npc, caster, skill, targets, isSummon); } } + caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); if (getRandom(100) < 33) { - caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.addItem("EnergySeed", itemId, getRandom(RATE + 1, 2 * RATE), null, true); } else { - caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED); caster.addItem("EnergySeed", itemId, getRandom(1, RATE), null, true); } seedCollectEvent(caster, npc, spawn._seedId); diff --git a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java index d818eb55a0..efbe1235b8 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java +++ b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java @@ -110,7 +110,7 @@ public class Lindvior extends AbstractNpcAI private void scheduleNextLindviorVisit() { - startQuestTimer("start", ((ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate()), null, null); + startQuestTimer("start", ALT_MODE ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate(), null, null); } private long scheduleNextLindviorDate() diff --git a/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java index cd873035a3..5aff82ccbb 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java +++ b/trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java @@ -70,7 +70,7 @@ public final class ZealotOfShilen extends AbstractNpcAI @Override public String onFirstTalk(L2Npc npc, L2PcInstance player) { - return (npc.isAttackingNow()) ? "32628-01.html" : npc.getId() + ".html"; + return npc.isAttackingNow() ? "32628-01.html" : npc.getId() + ".html"; } @Override diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java index bb985fd449..25cef1aa5a 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java @@ -806,7 +806,7 @@ public final class Stage1 extends Quest if (!isSummon && (player != null)) { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); - if ((tmpworld instanceof SOD1World) && (((SOD1World) tmpworld).getStatus() == 7) && spawnState(((SOD1World) tmpworld))) + if ((tmpworld instanceof SOD1World) && (((SOD1World) tmpworld).getStatus() == 7) && spawnState((SOD1World) tmpworld)) { for (int objId : ((SOD1World) tmpworld).getAllowed()) { @@ -997,7 +997,7 @@ public final class Stage1 extends Quest if (npcId == ALENOS) { final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); - if ((GraciaSeedsManager.getInstance().getSoDState() == 1) || ((world != null) && (world instanceof SOD1World))) + if ((GraciaSeedsManager.getInstance().getSoDState() == 1) || (world instanceof SOD1World)) { enterInstance(player, "SeedOfDestructionStage1.xml", ENTER_TELEPORT_1); } diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java index aa8054420e..ecd149501a 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java @@ -182,7 +182,6 @@ public final class HallOfSuffering extends AbstractNpcAI private static final int TEMPLATE_ID = 115; private static final int MIN_LEVEL = 75; private static final int MAX_LEVEL = 82; - private static final boolean debug = false; public HallOfSuffering() { @@ -198,11 +197,6 @@ public final class HallOfSuffering extends AbstractNpcAI private static boolean checkConditions(L2PcInstance player) { - if (debug) - { - return true; - } - final L2Party party = player.getParty(); if (party == null) { @@ -514,7 +508,7 @@ public final class HallOfSuffering extends AbstractNpcAI else if (event.equalsIgnoreCase("ressurectTwin")) { final Skill skill = SkillData.getInstance().getSkill(5824, 1); - final L2Npc aliveTwin = (world.klanikus == npc ? world.klodekus : world.klanikus); + final L2Npc aliveTwin = world.klanikus == npc ? world.klodekus : world.klanikus; npc.doRevive(); npc.doCast(skill); npc.setCurrentHp(aliveTwin.getCurrentHp()); diff --git a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java index 1afb4cb746..708c702e93 100644 --- a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java +++ b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java @@ -398,16 +398,13 @@ public abstract class AirShipController extends Quest { _log.log(Level.WARNING, getName() + ": Fuel consumption not defined."); } + else if (_teleportsTable.length != _fuelTable.length) + { + _log.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list."); + } else { - if (_teleportsTable.length != _fuelTable.length) - { - _log.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list."); - } - else - { - AirShipManager.getInstance().registerAirShipTeleportList(_dockZone, _locationId, _teleportsTable, _fuelTable); - } + AirShipManager.getInstance().registerAirShipTeleportList(_dockZone, _locationId, _teleportsTable, _fuelTable); } } } diff --git a/trunk/dist/game/data/scripts/handlers/MasterHandler.java b/trunk/dist/game/data/scripts/handlers/MasterHandler.java index c4d52731f8..bf28092d0f 100644 --- a/trunk/dist/game/data/scripts/handlers/MasterHandler.java +++ b/trunk/dist/game/data/scripts/handlers/MasterHandler.java @@ -537,13 +537,13 @@ final class MasterHandler // TODO: Add configuration options for this voiced commands: // CastleVCmd.class, // SetVCmd.class, - (Config.L2JMOD_ALLOW_WEDDING ? Wedding.class : null), - (Config.BANKING_SYSTEM_ENABLED ? Banking.class : null), - (Config.L2JMOD_CHAT_ADMIN ? ChatAdmin.class : null), - (Config.L2JMOD_MULTILANG_ENABLE && Config.L2JMOD_MULTILANG_VOICED_ALLOW ? Lang.class : null), - (Config.L2JMOD_DEBUG_VOICE_COMMAND ? Debug.class : null), - (Config.L2JMOD_ALLOW_CHANGE_PASSWORD ? ChangePassword.class : null), - (Config.PREMIUM_SYSTEM_ENABLED ? Premium.class : null), + Config.L2JMOD_ALLOW_WEDDING ? Wedding.class : null, + Config.BANKING_SYSTEM_ENABLED ? Banking.class : null, + Config.L2JMOD_CHAT_ADMIN ? ChatAdmin.class : null, + Config.L2JMOD_MULTILANG_ENABLE && Config.L2JMOD_MULTILANG_VOICED_ALLOW ? Lang.class : null, + Config.L2JMOD_DEBUG_VOICE_COMMAND ? Debug.class : null, + Config.L2JMOD_ALLOW_CHANGE_PASSWORD ? ChangePassword.class : null, + Config.PREMIUM_SYSTEM_ENABLED ? Premium.class : null, }, { // Target Handlers diff --git a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java index 2b68072f99..a1229a2522 100644 --- a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -89,41 +89,38 @@ public class L2PcInstanceAction implements IActionHandler { activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, player); } - else + // Check if this L2PcInstance is autoAttackable + else if (player.isAutoAttackable(activeChar)) { - // Check if this L2PcInstance is autoAttackable - if (player.isAutoAttackable(activeChar)) + if ((player.isCursedWeaponEquipped() && (activeChar.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL)) // + || (activeChar.isCursedWeaponEquipped() && (player.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL))) { - if ((player.isCursedWeaponEquipped() && (activeChar.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL)) // - || (activeChar.isCursedWeaponEquipped() && (player.getLevel() < CURSED_WEAPON_VICTIM_MIN_LEVEL))) - { - activeChar.sendPacket(ActionFailed.STATIC_PACKET); - } - else - { - if (GeoData.getInstance().canSeeTarget(activeChar, player)) - { - activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); - } - else - { - activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, player)); - } - activeChar.onActionRequest(); - } + activeChar.sendPacket(ActionFailed.STATIC_PACKET); } else { - // This Action Failed packet avoids activeChar getting stuck when clicking three or more times - activeChar.sendPacket(ActionFailed.STATIC_PACKET); if (GeoData.getInstance().canSeeTarget(activeChar, player)) { - activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); + activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player); } else { activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, player)); } + activeChar.onActionRequest(); + } + } + else + { + // This Action Failed packet avoids activeChar getting stuck when clicking three or more times + activeChar.sendPacket(ActionFailed.STATIC_PACKET); + if (GeoData.getInstance().canSeeTarget(activeChar, player)) + { + activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player); + } + else + { + activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, player)); } } } diff --git a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java index 912aaae5b5..cfa748b5ce 100644 --- a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java +++ b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java @@ -51,29 +51,26 @@ public class L2StaticObjectInstanceAction implements IActionHandler // Notify the L2PcInstance AI with AI_INTENTION_INTERACT activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, staticObject); } - else + else if (staticObject.getType() == 2) { - if (staticObject.getType() == 2) + final String filename = (staticObject.getId() == 24230101) ? "html/signboards/tomb_of_crystalgolem.htm" : "html/signboards/pvp_signboard.htm"; + final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); + final NpcHtmlMessage html = new NpcHtmlMessage(staticObject.getObjectId()); + + if (content != null) { - final String filename = (staticObject.getId() == 24230101) ? "html/signboards/tomb_of_crystalgolem.htm" : "html/signboards/pvp_signboard.htm"; - final String content = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), filename); - final NpcHtmlMessage html = new NpcHtmlMessage(staticObject.getObjectId()); - - if (content == null) - { - html.setHtml("Signboard is missing:
" + filename + ""); - } - else - { - html.setHtml(content); - } - - activeChar.sendPacket(html); + html.setHtml(content); } - else if (staticObject.getType() == 0) + else { - activeChar.sendPacket(staticObject.getMap()); + html.setHtml("Signboard is missing:
" + filename + ""); } + + activeChar.sendPacket(html); + } + else if (staticObject.getType() == 0) + { + activeChar.sendPacket(staticObject.getMap()); } } return true; diff --git a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java index b0376b9963..0c7b9bb048 100644 --- a/trunk/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java +++ b/trunk/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java @@ -72,12 +72,9 @@ public class L2SummonAction implements IActionHandler { activeChar.updateNotMoveUntil(); } - else + else if (GeoData.getInstance().canSeeTarget(activeChar, target)) { - if (GeoData.getInstance().canSeeTarget(activeChar, target)) - { - activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); - } + activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target); } } } diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index 078be616c1..2ec775ca61 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -40,7 +40,7 @@ import com.l2jmobius.util.StringUtil; public class AdminBuffs implements IAdminCommandHandler { - private final static int PAGE_LIMIT = 20; + private static final int PAGE_LIMIT = 20; private static final String[] ADMIN_COMMANDS = { @@ -253,7 +253,7 @@ public class AdminBuffs implements IAdminCommandHandler } final StringBuilder html = StringUtil.startAppend(500 + (effects.size() * 200), "
Effects of ", target.getName(), "

"); - final int start = ((page - 1) * PAGE_LIMIT); + final int start = (page - 1) * PAGE_LIMIT; final int end = Math.min(((page - 1) * PAGE_LIMIT) + PAGE_LIMIT, effects.size()); int count = 0; for (BuffInfo info : effects) @@ -294,7 +294,7 @@ public class AdminBuffs implements IAdminCommandHandler html.append("
SkillRem. TimeAction
"); // Buttons - StringUtil.append(html, "

"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java index 706d7a39fe..69fde4e057 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSpawn.java @@ -345,16 +345,13 @@ public class AdminSpawn implements IAdminCommandHandler } } } + else if (showposition && (npc != null)) + { + activeChar.sendMessage(index + " - " + spawn.getTemplate().getName() + " (" + spawn + "): " + npc.getX() + " " + npc.getY() + " " + npc.getZ()); + } else { - if (showposition && (npc != null)) - { - activeChar.sendMessage(index + " - " + spawn.getTemplate().getName() + " (" + spawn + "): " + npc.getX() + " " + npc.getY() + " " + npc.getZ()); - } - else - { - activeChar.sendMessage(index + " - " + spawn.getTemplate().getName() + " (" + spawn + "): " + spawn.getX() + " " + spawn.getY() + " " + spawn.getZ()); - } + activeChar.sendMessage(index + " - " + spawn.getTemplate().getName() + " (" + spawn + "): " + spawn.getX() + " " + spawn.getY() + " " + spawn.getZ()); } } diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java index ed5b13782a..0d1f59e109 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java @@ -113,23 +113,23 @@ public class AdminZone implements IAdminCommandHandler final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "html/admin/zone.htm"); final NpcHtmlMessage adminReply = new NpcHtmlMessage(); adminReply.setHtml(htmContent); - adminReply.replace("%PEACE%", (activeChar.isInsideZone(ZoneId.PEACE) ? "YES" : "NO")); - adminReply.replace("%PVP%", (activeChar.isInsideZone(ZoneId.PVP) ? "YES" : "NO")); - adminReply.replace("%SIEGE%", (activeChar.isInsideZone(ZoneId.SIEGE) ? "YES" : "NO")); - adminReply.replace("%TOWN%", (activeChar.isInsideZone(ZoneId.TOWN) ? "YES" : "NO")); - adminReply.replace("%CASTLE%", (activeChar.isInsideZone(ZoneId.CASTLE) ? "YES" : "NO")); - adminReply.replace("%FORT%", (activeChar.isInsideZone(ZoneId.FORT) ? "YES" : "NO")); - adminReply.replace("%HQ%", (activeChar.isInsideZone(ZoneId.HQ) ? "YES" : "NO")); - adminReply.replace("%CLANHALL%", (activeChar.isInsideZone(ZoneId.CLAN_HALL) ? "YES" : "NO")); - adminReply.replace("%LAND%", (activeChar.isInsideZone(ZoneId.LANDING) ? "YES" : "NO")); - adminReply.replace("%NOLAND%", (activeChar.isInsideZone(ZoneId.NO_LANDING) ? "YES" : "NO")); - adminReply.replace("%NOSUMMON%", (activeChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND) ? "YES" : "NO")); - adminReply.replace("%WATER%", (activeChar.isInsideZone(ZoneId.WATER) ? "YES" : "NO")); - adminReply.replace("%FISHING%", (activeChar.isInsideZone(ZoneId.FISHING) ? "YES" : "NO")); - adminReply.replace("%SWAMP%", (activeChar.isInsideZone(ZoneId.SWAMP) ? "YES" : "NO")); - adminReply.replace("%DANGER%", (activeChar.isInsideZone(ZoneId.DANGER_AREA) ? "YES" : "NO")); - adminReply.replace("%NOSTORE%", (activeChar.isInsideZone(ZoneId.NO_STORE) ? "YES" : "NO")); - adminReply.replace("%SCRIPT%", (activeChar.isInsideZone(ZoneId.SCRIPT) ? "YES" : "NO")); + adminReply.replace("%PEACE%", activeChar.isInsideZone(ZoneId.PEACE) ? "YES" : "NO"); + adminReply.replace("%PVP%", activeChar.isInsideZone(ZoneId.PVP) ? "YES" : "NO"); + adminReply.replace("%SIEGE%", activeChar.isInsideZone(ZoneId.SIEGE) ? "YES" : "NO"); + adminReply.replace("%TOWN%", activeChar.isInsideZone(ZoneId.TOWN) ? "YES" : "NO"); + adminReply.replace("%CASTLE%", activeChar.isInsideZone(ZoneId.CASTLE) ? "YES" : "NO"); + adminReply.replace("%FORT%", activeChar.isInsideZone(ZoneId.FORT) ? "YES" : "NO"); + adminReply.replace("%HQ%", activeChar.isInsideZone(ZoneId.HQ) ? "YES" : "NO"); + adminReply.replace("%CLANHALL%", activeChar.isInsideZone(ZoneId.CLAN_HALL) ? "YES" : "NO"); + adminReply.replace("%LAND%", activeChar.isInsideZone(ZoneId.LANDING) ? "YES" : "NO"); + adminReply.replace("%NOLAND%", activeChar.isInsideZone(ZoneId.NO_LANDING) ? "YES" : "NO"); + adminReply.replace("%NOSUMMON%", activeChar.isInsideZone(ZoneId.NO_SUMMON_FRIEND) ? "YES" : "NO"); + adminReply.replace("%WATER%", activeChar.isInsideZone(ZoneId.WATER) ? "YES" : "NO"); + adminReply.replace("%FISHING%", activeChar.isInsideZone(ZoneId.FISHING) ? "YES" : "NO"); + adminReply.replace("%SWAMP%", activeChar.isInsideZone(ZoneId.SWAMP) ? "YES" : "NO"); + adminReply.replace("%DANGER%", activeChar.isInsideZone(ZoneId.DANGER_AREA) ? "YES" : "NO"); + adminReply.replace("%NOSTORE%", activeChar.isInsideZone(ZoneId.NO_STORE) ? "YES" : "NO"); + adminReply.replace("%SCRIPT%", activeChar.isInsideZone(ZoneId.SCRIPT) ? "YES" : "NO"); final StringBuilder zones = new StringBuilder(100); final L2WorldRegion region = L2World.getInstance().getRegion(activeChar.getX(), activeChar.getY()); for (L2ZoneType zone : region.getZones()) @@ -163,8 +163,8 @@ public class AdminZone implements IAdminCommandHandler { final int worldX = activeChar.getX(); final int worldY = activeChar.getY(); - final int geoX = ((((worldX - (-327680)) >> 4) >> 11) + 10); - final int geoY = ((((worldY - (-262144)) >> 4) >> 11) + 10); + final int geoX = (((worldX - -327680) >> 4) >> 11) + 10; + final int geoY = (((worldY - -262144) >> 4) >> 11) + 10; activeChar.sendMessage("GeoRegion: " + geoX + "_" + geoY + ""); } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java index 0b04d952f0..38c00155af 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java @@ -128,7 +128,7 @@ public class ClanWarehouse implements IBypassHandler return false; } - private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder) + private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder) { player.sendPacket(ActionFailed.STATIC_PACKET); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index 8ec475617c..304e0acebb 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -90,7 +90,7 @@ public class Loto implements IBypassHandler // 23 - current lottery jackpot // 24 - Previous winning numbers/Prize claim // >24 - check lottery ticket by item object id - private static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val) + private static void showLotoWindow(L2PcInstance player, L2Npc npc, int val) { final int npcId = npc.getTemplate().getId(); String filename; @@ -99,7 +99,7 @@ public class Loto implements IBypassHandler if (val == 0) // 0 - first buy lottery ticket window { - filename = (npc.getHtmlPath(npcId, 1)); + filename = npc.getHtmlPath(npcId, 1); html.setFile(player.getHtmlPrefix(), filename); } else if ((val >= 1) && (val <= 21)) // 1-20 - buttons, 21 - second buy lottery ticket window @@ -117,7 +117,7 @@ public class Loto implements IBypassHandler return; } - filename = (npc.getHtmlPath(npcId, 5)); + filename = npc.getHtmlPath(npcId, 5); html.setFile(player.getHtmlPrefix(), filename); int count = 0; @@ -240,17 +240,17 @@ public class Loto implements IBypassHandler iu.addModifiedItem(adenaupdate); player.sendPacket(iu); - filename = (npc.getHtmlPath(npcId, 6)); + filename = npc.getHtmlPath(npcId, 6); html.setFile(player.getHtmlPrefix(), filename); } else if (val == 23) // 23 - current lottery jackpot { - filename = (npc.getHtmlPath(npcId, 3)); + filename = npc.getHtmlPath(npcId, 3); html.setFile(player.getHtmlPrefix(), filename); } else if (val == 24) // 24 - Previous winning numbers/Prize claim { - filename = (npc.getHtmlPath(npcId, 4)); + filename = npc.getHtmlPath(npcId, 4); html.setFile(player.getHtmlPrefix(), filename); final int lotonumber = Lottery.getInstance().getId(); @@ -308,7 +308,7 @@ public class Loto implements IBypassHandler } else if (val == 25) // 25 - lottery instructions { - filename = (npc.getHtmlPath(npcId, 2)); + filename = npc.getHtmlPath(npcId, 2); html.setFile(player.getHtmlPrefix(), filename); } else if (val > 25) // >25 - check lottery ticket by item object id diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index ab4b6dcf5e..2b2a3cdb69 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -114,7 +114,7 @@ public class NpcViewMod implements IBypassHandler { return false; } - sendNpcDropList(activeChar, npc, dropListScope, (st.hasMoreElements() ? Integer.parseInt(st.nextToken()) : 0)); + sendNpcDropList(activeChar, npc, dropListScope, st.hasMoreElements() ? Integer.parseInt(st.nextToken()) : 0); } catch (NumberFormatException e) { @@ -327,13 +327,9 @@ public class NpcViewMod implements IBypassHandler final MinMax minMax = getPreciseMinMax(normalized.getChance(), generalDropItem.getMin(npc, activeChar), generalDropItem.getMax(npc, activeChar), generalDropItem.isPreciseCalculated()); final long min = minMax.min; final long max = minMax.max; - if (min == max) + sb.append(amountFormat.format(min)); + if (min != max) { - sb.append(amountFormat.format(min)); - } - else - { - sb.append(amountFormat.format(min)); sb.append(" - "); sb.append(amountFormat.format(max)); } @@ -407,13 +403,9 @@ public class NpcViewMod implements IBypassHandler final long min = minMax.min; final long max = minMax.max; - if (min == max) + sb.append(amountFormat.format(min)); + if (min != max) { - sb.append(amountFormat.format(min)); - } - else - { - sb.append(amountFormat.format(min)); sb.append(" - "); sb.append(amountFormat.format(max)); } @@ -442,7 +434,7 @@ public class NpcViewMod implements IBypassHandler return new MinMax(min, max); } - final int mult = (int) (chance) / 100; + final int mult = (int) chance / 100; return new MinMax(mult * min, (chance % 100) > 0 ? (mult + 1) * max : mult * max); } } diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java index 86496586cd..8a33906a9e 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Observation.java @@ -155,7 +155,7 @@ public class Observation implements IBypassHandler return false; } - private static final void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost) + private static void doObserve(L2PcInstance player, L2Npc npc, Location pos, long cost) { if (player.reduceAdena("Broadcast", cost, npc, true)) { diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java index 40e4459bf0..17a32a34e7 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java @@ -126,14 +126,13 @@ public class OlympiadManagerLink implements IBypassHandler html.replace("%olympiad_period%", String.valueOf(Olympiad.getInstance().getPeriod())); html.replace("%olympiad_cycle%", String.valueOf(Olympiad.getInstance().getCurrentCycle())); html.replace("%olympiad_opponent%", String.valueOf(OlympiadManager.getInstance().getCountOpponents())); - activeChar.sendPacket(html); } else { html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_unregister.htm"); html.replace("%objectId%", String.valueOf(target.getObjectId())); - activeChar.sendPacket(html); } + activeChar.sendPacket(html); break; } case 1: // unregister @@ -199,15 +198,13 @@ public class OlympiadManagerLink implements IBypassHandler if (passes > 0) { html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_settle.htm"); - html.replace("%objectId%", String.valueOf(target.getObjectId())); - activeChar.sendPacket(html); } else { html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_nopoints2.htm"); - html.replace("%objectId%", String.valueOf(target.getObjectId())); - activeChar.sendPacket(html); } + html.replace("%objectId%", String.valueOf(target.getObjectId())); + activeChar.sendPacket(html); break; } case 7: // Equipment Rewards diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java index 6d9762fbf8..e7e49f7cd8 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java @@ -106,7 +106,7 @@ public class PrivateWarehouse implements IBypassHandler return false; } - private static final void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder) + private static void showWithdrawWindow(L2PcInstance player, WarehouseListType itemtype, byte sortorder) { player.sendPacket(ActionFailed.STATIC_PACKET); player.setActiveWarehouse(player.getWarehouse()); diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 0c84eec28e..02bf55dcba 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -213,7 +213,7 @@ public class QuestLink implements IBypassHandler if (q != null) { - if (((q.getId() >= 1) && (q.getId() < 20000)) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(true))) + if ((q.getId() >= 1) && (q.getId() < 20000) && ((player.getWeightPenalty() >= 3) || !player.isInventoryUnder90(true))) { player.sendPacket(SystemMessageId.UNABLE_TO_PROCESS_THIS_REQUEST_UNTIL_YOUR_INVENTORY_S_WEIGHT_AND_SLOT_COUNT_ARE_LESS_THAN_80_PERCENT_OF_CAPACITY); return; diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index e80b0473a4..2ea118757c 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler return false; } - private static final void tryRentPet(L2PcInstance player, int val) + private static void tryRentPet(L2PcInstance player, int val) { if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped()) { diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java index 47480db9ea..b932039875 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Wear.java @@ -68,7 +68,7 @@ public class Wear implements IBypassHandler return false; } - private static final void showWearWindow(L2PcInstance player, int val) + private static void showWearWindow(L2PcInstance player, int val) { final L2BuyList buyList = BuyListData.getInstance().getBuyList(val); if (buyList == null) diff --git a/trunk/dist/game/data/scripts/handlers/communityboard/RegionBoard.java b/trunk/dist/game/data/scripts/handlers/communityboard/RegionBoard.java index 0fcae7826a..5ca6225088 100644 --- a/trunk/dist/game/data/scripts/handlers/communityboard/RegionBoard.java +++ b/trunk/dist/game/data/scripts/handlers/communityboard/RegionBoard.java @@ -65,8 +65,8 @@ public class RegionBoard implements IWriteBoardHandler final L2Clan clan = ClanTable.getInstance().getClan(castle.getOwnerId()); String link = list.replaceAll("%region_id%", String.valueOf(i)); link = link.replace("%region_name%", String.valueOf(REGIONS[i])); - link = link.replace("%region_owning_clan%", (clan != null ? clan.getName() : "NPC")); - link = link.replace("%region_owning_clan_alliance%", ((clan != null) && (clan.getAllyName() != null) ? clan.getAllyName() : "")); + link = link.replace("%region_owning_clan%", clan != null ? clan.getName() : "NPC"); + link = link.replace("%region_owning_clan_alliance%", (clan != null) && (clan.getAllyName() != null) ? clan.getAllyName() : ""); link = link.replace("%region_tax_rate%", String.valueOf(castle.getTaxRate() * 100) + "%"); sb.append(link); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index e7b530ea73..c12675eaa5 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -42,7 +42,7 @@ public final class ChameleonRest extends AbstractEffect @Override public int getEffectFlags() { - return (EffectFlag.SILENT_MOVE.getMask() | EffectFlag.RELAXING.getMask()); + return EffectFlag.SILENT_MOVE.getMask() | EffectFlag.RELAXING.getMask(); } @Override diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java index a9f9313f4c..245de9e00e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ClassChange.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class ClassChange extends AbstractEffect { private final int _index; - private final static int IDENTITY_CRISIS_SKILL_ID = 1570; + private static final int IDENTITY_CRISIS_SKILL_ID = 1570; public ClassChange(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java index 52e89065a3..a8da42aba1 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java @@ -56,7 +56,7 @@ public final class CpHealPercent extends AbstractEffect double amount = 0; final double power = _power; - final boolean full = (power == 100.0); + final boolean full = power == 100.0; amount = full ? target.getMaxCp() : (target.getMaxCp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java index 3bd9c0e40c..d6e365823e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java @@ -87,7 +87,7 @@ public final class DispelBySlot extends AbstractEffect for (Entry entry : _dispelAbnormals.entrySet()) { // Dispel transformations (buff and by GM) - if ((entry.getKey() == AbnormalType.TRANSFORM) && (effected.isTransformed() || (effected.isPlayer() || (entry.getValue() == effected.getActingPlayer().getTransformationId()) || (entry.getValue() < 0)))) + if ((entry.getKey() == AbnormalType.TRANSFORM) && (effected.isTransformed() || effected.isPlayer() || (entry.getValue() == effected.getActingPlayer().getTransformationId()) || (entry.getValue() < 0))) { info.getEffected().stopTransformation(true); continue; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java index 2ffc56a5f0..6a9e83195e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java @@ -89,10 +89,10 @@ public final class DispelBySlotProbability extends AbstractEffect // Operation of O(n) for the amount of slots to dispel (which is usually small) and O(1) to get the buff. for (Entry entry : _dispelAbnormals.entrySet()) { - if ((Rnd.get(100) < _rate)) + if (Rnd.get(100) < _rate) { // Dispel transformations (buff and by GM) - if ((entry.getKey() == AbnormalType.TRANSFORM) && (effected.isTransformed() || (effected.isPlayer() || (entry.getValue() == effected.getActingPlayer().getTransformationId()) || (entry.getValue() < 0)))) + if ((entry.getKey() == AbnormalType.TRANSFORM) && (effected.isTransformed() || effected.isPlayer() || (entry.getValue() == effected.getActingPlayer().getTransformationId()) || (entry.getValue() < 0))) { info.getEffected().stopTransformation(true); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index c50fc3ccdd..abaee0f262 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -144,7 +144,7 @@ public final class EnergyAttack extends AbstractEffect attacker.decreaseCharges(3); } - final double addPower = (attacker.getStat().calcStat(Stats.MOMENTUM_SKILL_POWER, 1, null, null)); + final double addPower = attacker.getStat().calcStat(Stats.MOMENTUM_SKILL_POWER, 1, null, null); attack += _power; attack *= addPower; @@ -171,7 +171,7 @@ public final class EnergyAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java index 9e9c924aa4..7911be03ef 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java @@ -101,7 +101,7 @@ public final class FatalBlow extends AbstractEffect } // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FeohStance.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FeohStance.java index 23358f2f38..dbc046ee0f 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FeohStance.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FeohStance.java @@ -31,15 +31,15 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public class FeohStance extends AbstractEffect { - private final static int FIRE_STANCE = 11007; - private final static int WATER_STANCE = 11008; - private final static int WIND_STANCE = 11009; - private final static int EARTH_STANCE = 11010; - private final static int ELEMENTAL_SPIKE = 11011; - private final static int ELEMENTAL_CRASH = 11017; - private final static int ELEMENTAL_DESTRUCTION = 11023; - private final static int ELEMENTAL_BLAST = 11034; - private final static int ELEMENTAL_STORM = 11040; + private static final int FIRE_STANCE = 11007; + private static final int WATER_STANCE = 11008; + private static final int WIND_STANCE = 11009; + private static final int EARTH_STANCE = 11010; + private static final int ELEMENTAL_SPIKE = 11011; + private static final int ELEMENTAL_CRASH = 11017; + private static final int ELEMENTAL_DESTRUCTION = 11023; + private static final int ELEMENTAL_BLAST = 11034; + private static final int ELEMENTAL_STORM = 11040; private final HashSet _skillList = new HashSet<>(); private int _stanceId; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java index f52c93ba50..631b58c6e7 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java @@ -100,7 +100,7 @@ public final class Fishing extends AbstractEffect // check for equiped fishing rod final L2Weapon equipedWeapon = player.getActiveWeaponItem(); - if (((equipedWeapon == null) || (equipedWeapon.getItemType() != WeaponType.FISHINGROD))) + if ((equipedWeapon == null) || (equipedWeapon.getItemType() != WeaponType.FISHINGROD)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_FISHING_POLE_EQUIPPED); return; @@ -230,12 +230,12 @@ public final class Fishing extends AbstractEffect */ private static int computeBaitZ(L2PcInstance player, int baitX, int baitY, L2FishingZone fishingZone, L2WaterZone waterZone) { - if ((fishingZone == null)) + if (fishingZone == null) { return Integer.MIN_VALUE; } - if ((waterZone == null)) + if (waterZone == null) { return Integer.MIN_VALUE; } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java index 31f62d4fc6..28be25888a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusMaxEnergy.java @@ -50,7 +50,7 @@ public final class FocusMaxEnergy extends AbstractEffect final int maxCharge = (sonicMastery != null) ? sonicMastery.getLevel() : (focusMastery != null) ? focusMastery.getLevel() : (maximumForceMastery != null) ? 15 : 0; if (maxCharge != 0) { - info.getEffected().getActingPlayer().increaseCharges((maxCharge - info.getEffected().getActingPlayer().getCharges()), maxCharge); + info.getEffected().getActingPlayer().increaseCharges(maxCharge - info.getEffected().getActingPlayer().getCharges(), maxCharge); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java index 6f74039fa3..2a68911b35 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/FocusSouls.java @@ -57,7 +57,7 @@ public final class FocusSouls extends AbstractEffect final int maxSouls = (int) target.calcStat(Stats.MAX_SOULS, 0, null, null); if (maxSouls > 0) { - if ((target.getChargedSouls() < maxSouls)) + if (target.getChargedSouls() < maxSouls) { target.increaseSouls(((target.getChargedSouls() + _charge) <= maxSouls) ? _charge : (maxSouls - target.getChargedSouls())); } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java index 453b43541e..5fc91f9bb9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Harvesting.java @@ -118,7 +118,7 @@ public final class Harvesting extends AbstractEffect final int levelPlayer = activeChar.getLevel(); final int levelTarget = target.getLevel(); - int diff = (levelPlayer - levelTarget); + int diff = levelPlayer - levelTarget; if (diff < 0) { diff = -diff; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 93d3e0c4f8..89a3ad4a29 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -74,7 +74,7 @@ public final class Heal extends AbstractEffect final boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); final boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); - if (((sps || bss) && (activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass())) || activeChar.isSummon()) + if (((sps || bss) && activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass()) || activeChar.isSummon()) { staticShotBonus = info.getSkill().getMpConsume(); // static bonus for spiritshots mAtkMul = bss ? 4 : 2; @@ -128,21 +128,18 @@ public final class Heal extends AbstractEffect { target.sendPacket(SystemMessageId.REJUVENATING_HP); } + else if (activeChar.isPlayer() && (activeChar != target)) + { + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); + sm.addString(activeChar.getName()); + sm.addInt((int) amount); + target.sendPacket(sm); + } else { - if (activeChar.isPlayer() && (activeChar != target)) - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addString(activeChar.getName()); - sm.addInt((int) amount); - target.sendPacket(sm); - } - else - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); - sm.addInt((int) amount); - target.sendPacket(sm); - } + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HP_HAS_BEEN_RESTORED); + sm.addInt((int) amount); + target.sendPacket(sm); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index cd568f0dbe..56949f4e8d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -63,7 +63,7 @@ public final class HealPercent extends AbstractEffect double amount = 0; final double power = _power; - final boolean full = (power == 100.0); + final boolean full = power == 100.0; amount = full ? target.getMaxHp() : (target.getMaxHp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java index e66e61fd8c..ad4f47147b 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpByLevel.java @@ -61,7 +61,7 @@ public final class HpByLevel extends AbstractEffect // Calculation final double abs = _power; - final double absorb = ((info.getEffector().getCurrentHp() + abs) > info.getEffector().getMaxHp() ? info.getEffector().getMaxHp() : (info.getEffector().getCurrentHp() + abs)); + final double absorb = (info.getEffector().getCurrentHp() + abs) > info.getEffector().getMaxHp() ? info.getEffector().getMaxHp() : (info.getEffector().getCurrentHp() + abs); final int restored = (int) (absorb - info.getEffector().getCurrentHp()); info.getEffector().setCurrentHp(absorb); // System message diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index a1242fe7e4..0146c82424 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -74,7 +74,7 @@ public final class HpCpHeal extends AbstractEffect final boolean sps = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.SPIRITSHOTS); final boolean bss = info.getSkill().isMagic() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS); - if (((sps || bss) && (activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass())) || activeChar.isSummon()) + if (((sps || bss) && activeChar.isPlayer() && activeChar.getActingPlayer().isMageClass()) || activeChar.isSummon()) { staticShotBonus = info.getSkill().getMpConsume(); // static bonus for spiritshots mAtkMul = bss ? 4 : 2; @@ -151,19 +151,18 @@ public final class HpCpHeal extends AbstractEffect { target.setCurrentCp(amount + target.getCurrentCp()); + final SystemMessage sm; if (activeChar.isPlayer() && (activeChar != target)) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); + sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); sm.addString(activeChar.getName()); - sm.addInt((int) amount); - target.sendPacket(sm); } else { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); - sm.addInt((int) amount); - target.sendPacket(sm); + sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CP_HAS_BEEN_RESTORED); } + sm.addInt((int) amount); + target.sendPacket(sm); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java index f6660bf00c..8892b0c06d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java @@ -87,8 +87,8 @@ public final class HpDrain extends AbstractEffect drain = damage; } - final double hpAdd = (_power * drain); - final double hpFinal = ((activeChar.getCurrentHp() + hpAdd) > activeChar.getMaxHp() ? activeChar.getMaxHp() : (activeChar.getCurrentHp() + hpAdd)); + final double hpAdd = _power * drain; + final double hpFinal = (activeChar.getCurrentHp() + hpAdd) > activeChar.getMaxHp() ? activeChar.getMaxHp() : (activeChar.getCurrentHp() + hpAdd); activeChar.setCurrentHp(hpFinal); if (damage > 0) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java index fd4b7685f2..30a2ad95eb 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java @@ -79,7 +79,7 @@ public final class MagicalAttack extends AbstractEffect } // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java index c2d1708598..a3b0b6a5e9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java @@ -73,12 +73,12 @@ public final class MagicalAttackByAbnormal extends AbstractEffect int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); // each buff increase +30% - damage *= (((target.getBuffCount() * 0.3) + 1.3) / 4); + damage *= ((target.getBuffCount() * 0.3) + 1.3) / 4; if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 67f810c991..055d61e70d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -91,7 +91,7 @@ public final class MagicalAttackMp extends AbstractEffect final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill()); final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill())); final double damage = Formulas.calcManaDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit); - final double mp = (damage > target.getCurrentMp() ? target.getCurrentMp() : damage); + final double mp = damage > target.getCurrentMp() ? target.getCurrentMp() : damage; if (damage > 0) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java index 2ed427a0c7..d95509a02c 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java @@ -80,7 +80,7 @@ public final class MagicalSoulAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 6b0cf1c951..1c0dac198f 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -63,7 +63,7 @@ public final class ManaHealPercent extends AbstractEffect double amount = 0; final double power = _power; - final boolean full = (power == 100.0); + final boolean full = power == 100.0; amount = full ? target.getMaxMp() : (target.getMaxMp() * power) / 100.0; // Prevents overheal and negative amount diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java index 371ae3b6c7..eb01b3bac2 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java @@ -81,7 +81,7 @@ public final class MarkRetriever extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (effected.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = effected.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java index 8dfeed5bb4..3325cde7cd 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxCp.java @@ -80,7 +80,7 @@ public final class MaxCp extends AbstractEffect charStat.getActiveChar().addStatFunc(new FuncAdd(Stats.MAX_CP, 1, this, _power, null)); if (_heal) { - effected.setCurrentCp((currentCp + _power)); + effected.setCurrentCp(currentCp + _power); } break; } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java index a925d1252d..6a380ee76e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/MaxHp.java @@ -80,7 +80,7 @@ public final class MaxHp extends AbstractEffect charStat.getActiveChar().addStatFunc(new FuncAdd(Stats.MAX_HP, 1, this, _power, null)); if (_heal) { - effected.setCurrentHp((currentHp + _power)); + effected.setCurrentHp(currentHp + _power); } break; } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 60d5662c2b..abd27784dc 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -135,7 +135,7 @@ public final class PhysicalAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index ca190c5f5b..2ddc8c1ec0 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -88,7 +88,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 09b635501e..77eea3067e 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -103,7 +103,7 @@ public final class PhysicalSoulAttack extends AbstractEffect if (damage > 0) { // reduce damage if target has maxdamage buff - final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { damage = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java index 17c738ae29..394f4ebd61 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/RebalanceHP.java @@ -73,7 +73,7 @@ public final class RebalanceHP extends AbstractEffect } final L2Summon summon = member.getPet(); - if ((summon != null) && (!summon.isDead() && Util.checkIfInRange(skill.getAffectRange(), effector, summon, true))) + if ((summon != null) && !summon.isDead() && Util.checkIfInRange(skill.getAffectRange(), effector, summon, true)) { fullHP += summon.getMaxHp(); currentHPs += summon.getCurrentHp(); @@ -106,7 +106,7 @@ public final class RebalanceHP extends AbstractEffect member.setCurrentHp(newHP); } final L2Summon summon = member.getPet(); - if ((summon != null) && (!summon.isDead() && Util.checkIfInRange(skill.getAffectRange(), effector, summon, true))) + if ((summon != null) && !summon.isDead() && Util.checkIfInRange(skill.getAffectRange(), effector, summon, true)) { double newHP = (summon.getMaxHp() * currentHPs) / fullHP; if (newHP > summon.getCurrentHp()) // The target gets healed diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Sow.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Sow.java index d0593def1e..a3203293cd 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Sow.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Sow.java @@ -58,7 +58,7 @@ public final class Sow extends AbstractEffect final L2PcInstance player = info.getEffector().getActingPlayer(); final L2MonsterInstance target = (L2MonsterInstance) info.getEffected(); - if (target.isDead() || (!target.getTemplate().canBeSown()) || target.isSeeded() || (target.getSeederId() != player.getObjectId())) + if (target.isDead() || !target.getTemplate().canBeSown() || target.isSeeded() || (target.getSeederId() != player.getObjectId())) { return; } @@ -116,7 +116,7 @@ public final class Sow extends AbstractEffect // 5% decrease in chance if player level // is more than +/- 5 levels to _target's_ level - int diff = (levelPlayer - levelTarget); + int diff = levelPlayer - levelTarget; if (diff < 0) { diff = -diff; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java index cbd05e0498..2995332409 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java @@ -52,7 +52,7 @@ public final class StaticDamage extends AbstractEffect } // reduce damage if target has maxdamage buff - final double maxDamage = (info.getEffected().getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null)); + final double maxDamage = info.getEffected().getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null); if (maxDamage > 0) { _power = (int) maxDamage; diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java index f45b40093e..15ba3ccc33 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/SummonNpc.java @@ -155,8 +155,8 @@ public final class SummonNpc extends AbstractEffect int y = player.getY(); if (_randomOffset) { - x += (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20)); - y += (Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20)); + x += Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20); + y += Rnd.nextBoolean() ? Rnd.get(20, 50) : Rnd.get(-50, -20); } spawn.setX(x); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java index 58768efa36..bbd77d44bf 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/ThrowHorizontal.java @@ -79,7 +79,7 @@ public final class ThrowHorizontal extends AbstractEffect final int z = info.getEffected().getZ(); // Prevent using skill with this effect on NPC that not monster - if (!(info.getEffected().isMonster() || info.getEffected().isRaidMinion() || info.getEffected().isMinion() || info.getEffected().isSummon() || info.getEffected().isPlayer())) + if (!info.getEffected().isMonster() && !info.getEffected().isRaidMinion() && !info.getEffected().isMinion() && !info.getEffected().isSummon() && !info.getEffected().isPlayer()) { final L2PcInstance effector = (L2PcInstance) info.getEffector(); effector.sendPacket(SystemMessageId.INVALID_TARGET); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java index 15388e3779..acc7081a2a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TransferHate.java @@ -67,7 +67,7 @@ public final class TransferHate extends AbstractEffect continue; } - final L2Attackable hater = ((L2Attackable) obj); + final L2Attackable hater = (L2Attackable) obj; final int hate = hater.getHating(info.getEffector()); if (hate <= 0) { diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java index e733ee183f..358bc3ec55 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerForce.java @@ -114,10 +114,10 @@ public final class TriggerForce extends AbstractEffect // apply offensive aura to enemies if ((_skill.getSkillId() == RAGE_AURA) || (_skill.getSkillId() == ROLLING_THUNDER)) { - final boolean srcInArena = (effector.isInsideZone(ZoneId.PVP) && (!effector.isInsideZone(ZoneId.SIEGE))); + final boolean srcInArena = effector.isInsideZone(ZoneId.PVP) && !effector.isInsideZone(ZoneId.SIEGE); for (L2Character obj : effector.getKnownList().getKnownCharactersInRadius(200)) { - if (((obj.isAttackable() || obj.isPlayable()) && !obj.isDoor()) && Skill.checkForAreaOffensiveSkills(effector, obj, _skill.getSkill(), srcInArena) && !_affectedObjects.contains(obj)) + if ((obj.isAttackable() || obj.isPlayable()) && !obj.isDoor() && Skill.checkForAreaOffensiveSkills(effector, obj, _skill.getSkill(), srcInArena) && !_affectedObjects.contains(obj)) { _affectedObjects.add(obj); _skill.getSkill().applyEffects(effector, obj); @@ -159,7 +159,7 @@ public final class TriggerForce extends AbstractEffect } if (!member.getEffectList().isAffectedBySkill(_skill.getSkillId()) && (member.calculateDistance(effector, true, false) < 900) && (_skill.getSkillId() != RAGE_AURA) && (_skill.getSkillId() != ROLLING_THUNDER)) { - if ((member != effector)) + if (member != effector) { _skill.getSkill().applyEffects(effector, member); } @@ -234,13 +234,13 @@ public final class TriggerForce extends AbstractEffect activeForces++; } - if (((activeForces < 4) || ((member.getEffectList().getBuffInfoBySkillId(AEORE_FORCE) == null) || (member.getEffectList().getBuffInfoBySkillId(SIGEL_FORCE) == null))) && (member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY) != null)) + if (((activeForces < 4) || (member.getEffectList().getBuffInfoBySkillId(AEORE_FORCE) == null) || (member.getEffectList().getBuffInfoBySkillId(SIGEL_FORCE) == null)) && (member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY) != null)) { member.getEffectList().remove(true, member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY)); } - if ((activeForces >= 4) && (member.getEffectList().getBuffInfoBySkillId(AEORE_FORCE) != null) && (member.getEffectList().getBuffInfoBySkillId(SIGEL_FORCE) != null) && (!member.getEffectList().isAffectedBySkill(PARTY_SOLIDARITY) || (member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY).getSkill().getLevel() != Math.min((activeForces - 3), 3)))) + if ((activeForces >= 4) && (member.getEffectList().getBuffInfoBySkillId(AEORE_FORCE) != null) && (member.getEffectList().getBuffInfoBySkillId(SIGEL_FORCE) != null) && (!member.getEffectList().isAffectedBySkill(PARTY_SOLIDARITY) || (member.getEffectList().getBuffInfoBySkillId(PARTY_SOLIDARITY).getSkill().getLevel() != Math.min(activeForces - 3, 3)))) { - member.makeTriggerCast(SkillData.getInstance().getSkill(PARTY_SOLIDARITY, Math.min((activeForces - 3), 3)), member); + member.makeTriggerCast(SkillData.getInstance().getSkill(PARTY_SOLIDARITY, Math.min(activeForces - 3, 3)), member); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 0e0a39745f..f72bdc5d2a 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -84,7 +84,7 @@ public final class TriggerSkillByAttack extends AbstractEffect public void onAttackEvent(OnCreatureDamageDealt event) { - if (event.isDamageOverTime() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0))) + if (event.isDamageOverTime() || (_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0)) { return; } @@ -130,7 +130,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } if (!((L2Character) triggerTarget).isInvul()) { - event.getAttacker().makeTriggerCast(triggerSkill, ((L2Character) triggerTarget)); + event.getAttacker().makeTriggerCast(triggerSkill, (L2Character) triggerTarget); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index 5f970de000..9a48d32696 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -59,7 +59,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect public void onAvoidEvent(OnCreatureAttackAvoid event) { - if (event.isDamageOverTime() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0))) + if (event.isDamageOverTime() || (_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0)) { return; } @@ -85,7 +85,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } if (!((L2Character) triggerTarget).isInvul()) { - event.getTarget().makeTriggerCast(triggerSkill, ((L2Character) triggerTarget)); + event.getTarget().makeTriggerCast(triggerSkill, (L2Character) triggerTarget); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index 15718a890f..9679e5f354 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -98,7 +98,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } if (!((L2Character) triggerTarget).isInvul()) { - event.getTarget().makeTriggerCast(triggerSkill, ((L2Character) triggerTarget)); + event.getTarget().makeTriggerCast(triggerSkill, (L2Character) triggerTarget); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 602f9f7ce3..f43e3f5c0d 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -62,7 +62,7 @@ public final class TriggerSkillBySkill extends AbstractEffect public void onSkillUseEvent(OnCreatureSkillUse event) { - if ((_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0) || ((_castSkillId == 0) && (_skill.getSkillId() != AQUAMARINE)))) + if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLvl() == 0) || ((_castSkillId == 0) && (_skill.getSkillId() != AQUAMARINE))) { return; } @@ -93,7 +93,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } if (!((L2Character) triggerTarget).isInvul()) { - event.getCaster().makeTriggerCast(triggerSkill, ((L2Character) triggerTarget)); + event.getCaster().makeTriggerCast(triggerSkill, (L2Character) triggerTarget); } } } diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java index 8368530886..bae62ee168 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java @@ -45,11 +45,7 @@ public final class Unsummon extends AbstractEffect public boolean calcSuccess(BuffInfo info) { final int magicLevel = info.getSkill().getMagicLevel(); - if (((magicLevel <= 0) || ((info.getEffected().getLevel() - 9) <= magicLevel)) && ((_chance * Formulas.calcAttributeBonus(info.getEffector(), info.getEffected(), info.getSkill()) * Formulas.calcGeneralTraitBonus(info.getEffector(), info.getEffected(), info.getSkill().getTraitType(), false)) > (Rnd.nextDouble() * 100))) - { - return true; - } - return false; + return ((magicLevel <= 0) || ((info.getEffected().getLevel() - 9) <= magicLevel)) && ((_chance * Formulas.calcAttributeBonus(info.getEffector(), info.getEffected(), info.getSkill()) * Formulas.calcGeneralTraitBonus(info.getEffector(), info.getEffected(), info.getSkill().getTraitType(), false)) > (Rnd.nextDouble() * 100)); } @Override diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 784c1100c2..7a5d0ab197 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -117,15 +117,15 @@ public class BeastSoulShot implements IItemHandler { pet.setChargedShot(ShotType.SOULSHOTS, true); // Visual effect change if player has equipped Ruby lvl 3 or higher - if ((activeOwner.getInventory().getItemByItemId(38859) != null) && (activeOwner.getInventory().getItemByItemId(38859).isEquipped())) + if ((activeOwner.getInventory().getItemByItemId(38859) != null) && activeOwner.getInventory().getItemByItemId(38859).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17817, 1, 0, 0), 600); } - else if ((activeOwner.getInventory().getItemByItemId(38858) != null) && (activeOwner.getInventory().getItemByItemId(38858).isEquipped())) + else if ((activeOwner.getInventory().getItemByItemId(38858) != null) && activeOwner.getInventory().getItemByItemId(38858).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17816, 1, 0, 0), 600); } - else if ((activeOwner.getInventory().getItemByItemId(38857) != null) && (activeOwner.getInventory().getItemByItemId(38857).isEquipped())) + else if ((activeOwner.getInventory().getItemByItemId(38857) != null) && activeOwner.getInventory().getItemByItemId(38857).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17815, 1, 0, 0), 600); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index 8bfbf8ac5d..fd1df6efdd 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -68,7 +68,7 @@ public class BeastSpiritShot implements IItemHandler } final int itemId = item.getId(); - final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! + final boolean isBlessed = (itemId == 6647) || (itemId == 20334); // TODO: Unhardcode these! final SkillHolder[] skills = item.getItem().getSkills(); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; @@ -119,15 +119,15 @@ public class BeastSpiritShot implements IItemHandler { pet.setChargedShot(shotType, true); // Visual effect change if player has equipped Sapphire lvl 3 or higher - if ((activeOwner.getInventory().getItemByItemId(38931) != null) && (activeOwner.getInventory().getItemByItemId(38931).isEquipped())) + if ((activeOwner.getInventory().getItemByItemId(38931) != null) && activeOwner.getInventory().getItemByItemId(38931).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17821, 2, 0, 0), 600); } - else if ((activeOwner.getInventory().getItemByItemId(38930) != null) && (activeOwner.getInventory().getItemByItemId(38930).isEquipped())) + else if ((activeOwner.getInventory().getItemByItemId(38930) != null) && activeOwner.getInventory().getItemByItemId(38930).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17820, 2, 0, 0), 600); } - else if ((activeOwner.getInventory().getItemByItemId(38929) != null) && (activeOwner.getInventory().getItemByItemId(38929).isEquipped())) + else if ((activeOwner.getInventory().getItemByItemId(38929) != null) && activeOwner.getInventory().getItemByItemId(38929).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeOwner, new MagicSkillUse(pet, pet, 17819, 2, 0, 0), 600); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 3234e5b32a..d1dc5ad1d7 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -97,15 +97,15 @@ public class BlessedSpiritShot implements IItemHandler activeChar.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED); activeChar.setChargedShot(ShotType.BLESSED_SPIRITSHOTS, true); // Visual effect change if player has equipped Sapphire lvl 3 or higher - if ((activeChar.getInventory().getItemByItemId(38931) != null) && (activeChar.getInventory().getItemByItemId(38931).isEquipped())) + if ((activeChar.getInventory().getItemByItemId(38931) != null) && activeChar.getInventory().getItemByItemId(38931).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17821, 2, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38930) != null) && (activeChar.getInventory().getItemByItemId(38930).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38930) != null) && activeChar.getInventory().getItemByItemId(38930).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17820, 2, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38929) != null) && (activeChar.getInventory().getItemByItemId(38929).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38929) != null) && activeChar.getInventory().getItemByItemId(38929).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17819, 2, 0, 0), 600); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java index a63bd0b888..6f39f34a4e 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/Bypass.java @@ -44,14 +44,13 @@ public class Bypass implements IItemHandler if (content == null) { html.setHtml("My Text is missing:
" + filename + ""); - activeChar.sendPacket(html); } else { html.setHtml(content); html.replace("%itemId%", String.valueOf(item.getObjectId())); - activeChar.sendPacket(html); } + activeChar.sendPacket(html); return true; } } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index b399032dbc..a97d51a496 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -199,25 +199,24 @@ public class ExtractableItems implements IItemHandler private void sendMessage(L2PcInstance player, L2ItemInstance item) { + final SystemMessage sm; if (item.getCount() > 1) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); + sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S2_S1); sm.addItemName(item); sm.addLong(item.getCount()); - player.sendPacket(sm); } else if (item.getEnchantLevel() > 0) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); + sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_A_S1_S2); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); - player.sendPacket(sm); } else { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); + sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OBTAINED_S1); sm.addItemName(item); - player.sendPacket(sm); } + player.sendPacket(sm); } } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java index 2e6a0c459b..e032623b89 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/FatedSupportBox.java @@ -74,20 +74,17 @@ public class FatedSupportBox implements IItemHandler { player.addItem(getClass().getSimpleName(), 37316, 1, player, true); } + else if (CategoryData.getInstance().isInCategory(CategoryType.SUB_GROUP_ROGUE, classId.getId())) + { + player.addItem(getClass().getSimpleName(), 37318, 1, player, true); + } + else if (CategoryData.getInstance().isInCategory(CategoryType.SUB_GROUP_KNIGHT, classId.getId())) + { + player.addItem(getClass().getSimpleName(), 37315, 1, player, true); + } else { - if (CategoryData.getInstance().isInCategory(CategoryType.SUB_GROUP_ROGUE, classId.getId())) - { - player.addItem(getClass().getSimpleName(), 37318, 1, player, true); - } - else if (CategoryData.getInstance().isInCategory(CategoryType.SUB_GROUP_KNIGHT, classId.getId())) - { - player.addItem(getClass().getSimpleName(), 37315, 1, player, true); - } - else - { - player.addItem(getClass().getSimpleName(), 37317, 1, player, true); - } + player.addItem(getClass().getSimpleName(), 37317, 1, player, true); } break; } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/Recipes.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/Recipes.java index 8b6bd6d297..77dae24a5a 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/Recipes.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/Recipes.java @@ -64,14 +64,14 @@ public class Recipes implements IItemHandler if (rp.isDwarvenRecipe()) { canCraft = activeChar.hasDwarvenCraft(); - recipeLevel = (rp.getLevel() > activeChar.getDwarvenCraft()); - recipeLimit = (activeChar.getDwarvenRecipeBook().length >= activeChar.getDwarfRecipeLimit()); + recipeLevel = rp.getLevel() > activeChar.getDwarvenCraft(); + recipeLimit = activeChar.getDwarvenRecipeBook().length >= activeChar.getDwarfRecipeLimit(); } else { canCraft = activeChar.hasCommonCraft(); - recipeLevel = (rp.getLevel() > activeChar.getCommonCraft()); - recipeLimit = (activeChar.getCommonRecipeBook().length >= activeChar.getCommonRecipeLimit()); + recipeLevel = rp.getLevel() > activeChar.getCommonCraft(); + recipeLimit = activeChar.getCommonRecipeBook().length >= activeChar.getCommonRecipeLimit(); } if (!canCraft) diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index aed43445dd..8a3c4029ef 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -111,15 +111,15 @@ public class SoulShots implements IItemHandler // Send message to client activeChar.sendPacket(SystemMessageId.YOUR_SOULSHOTS_ARE_ENABLED); // Visual effect change if player has equipped Ruby lvl 3 or higher - if ((activeChar.getInventory().getItemByItemId(38859) != null) && (activeChar.getInventory().getItemByItemId(38859).isEquipped())) + if ((activeChar.getInventory().getItemByItemId(38859) != null) && activeChar.getInventory().getItemByItemId(38859).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17817, 1, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38858) != null) && (activeChar.getInventory().getItemByItemId(38858).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38858) != null) && activeChar.getInventory().getItemByItemId(38858).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17816, 1, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38857) != null) && (activeChar.getInventory().getItemByItemId(38857).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38857) != null) && activeChar.getInventory().getItemByItemId(38857).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17815, 1, 0, 0), 600); } diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 54ba891e02..ed309973ab 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -98,15 +98,15 @@ public class SpiritShot implements IItemHandler // Send message to client activeChar.sendPacket(SystemMessageId.YOUR_SPIRITSHOT_HAS_BEEN_ENABLED); // Visual effect change if player has equipped Sapphire lvl 3 or higher - if ((activeChar.getInventory().getItemByItemId(38931) != null) && (activeChar.getInventory().getItemByItemId(38931).isEquipped())) + if ((activeChar.getInventory().getItemByItemId(38931) != null) && activeChar.getInventory().getItemByItemId(38931).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17821, 1, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38930) != null) && (activeChar.getInventory().getItemByItemId(38930).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38930) != null) && activeChar.getInventory().getItemByItemId(38930).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17820, 1, 0, 0), 600); } - else if ((activeChar.getInventory().getItemByItemId(38929) != null) && (activeChar.getInventory().getItemByItemId(38929).isEquipped())) + else if ((activeChar.getInventory().getItemByItemId(38929) != null) && activeChar.getInventory().getItemByItemId(38929).isEquipped()) { Broadcast.toSelfAndKnownPlayersInRadius(activeChar, new MagicSkillUse(activeChar, activeChar, 17819, 1, 0, 0), 600); } diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java index 8f819f1cd4..6e41896bcd 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java @@ -126,7 +126,7 @@ public class ChatBanHandler implements IPunishmentHandler */ private static void applyToPlayer(PunishmentTask task, L2PcInstance player) { - final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been chat banned for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index db3e734bcc..734343a166 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -186,7 +186,7 @@ public class JailHandler implements IPunishmentHandler player.sendPacket(msg); if (task != null) { - final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000); + final long delay = (task.getExpirationTime() - System.currentTimeMillis()) / 1000; if (delay > 0) { player.sendMessage("You've been jailed for " + (delay > 60 ? ((delay / 60) + " minutes.") : delay + " seconds.")); diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java index 1c60d7366c..f74b0d726b 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Area.java @@ -38,14 +38,14 @@ public class Area implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) + if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!target.isAttackable() && !target.isPlayable())) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); return EMPTY_TARGET_LIST; } final L2Character origin; - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); if (skill.getCastRange() >= 0) { @@ -74,7 +74,7 @@ public class Area implements ITargetTypeHandler final Collection objs = activeChar.getKnownList().getKnownCharacters(); for (L2Character obj : objs) { - if (!(obj.isAttackable() || obj.isPlayable()) || (obj == origin)) + if ((!obj.isAttackable() && !obj.isPlayable()) || (obj == origin)) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java index d38124d46f..a4a35161fa 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaCorpseMob.java @@ -58,7 +58,7 @@ public class AreaCorpseMob implements ITargetTypeHandler final Collection objs = activeChar.getKnownList().getKnownCharacters(); for (L2Character obj : objs) { - if (!(obj.isAttackable() || obj.isPlayable()) || !Util.checkIfInRange(skill.getAffectRange(), target, obj, true)) + if ((!obj.isAttackable() && !obj.isPlayable()) || !Util.checkIfInRange(skill.getAffectRange(), target, obj, true)) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java index b125609889..1952e6fab9 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java @@ -167,7 +167,7 @@ public class AreaFriendly implements ITargetTypeHandler @Override public int compare(L2Character char1, L2Character char2) { - return Double.compare((char1.getCurrentHp() / char1.getMaxHp()), (char2.getCurrentHp() / char2.getMaxHp())); + return Double.compare(char1.getCurrentHp() / char1.getMaxHp(), char2.getCurrentHp() / char2.getMaxHp()); } } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java index 22b0b9622d..e2aea3d904 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java @@ -50,7 +50,7 @@ public class AreaSummon implements ITargetTypeHandler }; } - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); final Collection objs = target.getKnownList().getKnownCharacters(); final int maxTargets = skill.getAffectLimit(); @@ -66,7 +66,7 @@ public class AreaSummon implements ITargetTypeHandler continue; } - if (!(obj.isAttackable() || obj.isPlayable())) + if (!obj.isAttackable() && !obj.isPlayable()) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Aura.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Aura.java index 160c7f7c30..707e279e50 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Aura.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Aura.java @@ -37,7 +37,7 @@ public class Aura implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); for (L2Character obj : activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange())) { if (obj.isDoor() || obj.isAttackable() || obj.isPlayable()) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java index 33ffcd72d8..ef328b7f06 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindArea.java @@ -38,14 +38,14 @@ public class BehindArea implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) + if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!target.isAttackable() && !target.isPlayable())) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); return EMPTY_TARGET_LIST; } final L2Character origin; - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); if (skill.getCastRange() >= 0) { @@ -74,7 +74,7 @@ public class BehindArea implements ITargetTypeHandler final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { - if (!(obj.isAttackable() || obj.isPlayable())) + if (!obj.isAttackable() && !obj.isPlayable()) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java index 49c45522bb..4cb59fc13c 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/BehindAura.java @@ -36,7 +36,7 @@ public class BehindAura implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); final Collection objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java index 6ba4a098ac..de7bfae9df 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontArea.java @@ -38,14 +38,14 @@ public class FrontArea implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isAttackable() || target.isPlayable()))) + if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!target.isAttackable() && !target.isPlayable())) { activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); return EMPTY_TARGET_LIST; } final L2Character origin; - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); if (skill.getCastRange() >= 0) { @@ -74,7 +74,7 @@ public class FrontArea implements ITargetTypeHandler final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) { - if (!(obj.isAttackable() || obj.isPlayable())) + if (!obj.isAttackable() && !obj.isPlayable()) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java index 6c3fe60ffb..667819ec36 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/FrontAura.java @@ -36,7 +36,7 @@ public class FrontAura implements ITargetTypeHandler public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target) { final List targetList = new ArrayList<>(); - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); final Collection objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange()); final int maxTargets = skill.getAffectLimit(); for (L2Character obj : objs) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/Ground.java b/trunk/dist/game/data/scripts/handlers/targethandlers/Ground.java index aee340cc67..ce239a4e31 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/Ground.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/Ground.java @@ -39,7 +39,7 @@ public class Ground implements ITargetTypeHandler final List targetList = new ArrayList<>(); final L2PcInstance player = (L2PcInstance) activeChar; final int maxTargets = skill.getAffectLimit(); - final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE)); + final boolean srcInArena = activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE); for (L2Character character : activeChar.getKnownList().getKnownCharacters()) { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java index 56632edd4d..bb4190b182 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyClan.java @@ -72,7 +72,7 @@ public class PartyClan implements ITargetTypeHandler }); // if player in clan and not in party - if (!(hasClan || hasParty)) + if (!hasClan && !hasParty) { return targetList.toArray(new L2Character[targetList.size()]); } @@ -117,7 +117,7 @@ public class PartyClan implements ITargetTypeHandler } } - if (!((hasClan && (obj.getClanId() == player.getClanId())) || (hasParty && obj.isInParty() && (player.getParty().getLeaderObjectId() == obj.getParty().getLeaderObjectId())))) + if ((!hasClan || (obj.getClanId() != player.getClanId())) && (!hasParty || !obj.isInParty() || (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyMember.java b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyMember.java index 84cc57f7dd..861e867db1 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/PartyMember.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/PartyMember.java @@ -36,7 +36,7 @@ public class PartyMember implements ITargetTypeHandler activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); return EMPTY_TARGET_LIST; } - if (!target.isDead() && ((target == activeChar) || (activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())) || ((activeChar.isPlayer() && target.isSummon() && ((activeChar.getPet() == target) || activeChar.hasServitor(target.getObjectId()))) || (activeChar.isSummon() && target.isPlayer() && ((activeChar == target.getPet()) || target.hasServitor(activeChar.getObjectId())))))) + if (!target.isDead() && ((target == activeChar) || (activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())) || (activeChar.isPlayer() && target.isSummon() && ((activeChar.getPet() == target) || activeChar.hasServitor(target.getObjectId()))) || (activeChar.isSummon() && target.isPlayer() && ((activeChar == target.getPet()) || target.hasServitor(activeChar.getObjectId()))))) { return new L2Character[] { diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java b/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java index d1ac95848a..f29b258c3a 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/TargetParty.java @@ -51,7 +51,7 @@ public class TargetParty implements ITargetTypeHandler { for (L2PcInstance partyMember : player.getParty().getMembers()) { - if ((partyMember == null)) + if (partyMember == null) { continue; } diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java index 877af023ee..5224459563 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/DebugHandler.java @@ -434,7 +434,7 @@ public class DebugHandler implements ITelnetHandler uptime = uptime / 1000; final int h = uptime / 3600; final int m = (uptime - (h * 3600)) / 60; - final int s = ((uptime - (h * 3600)) - (m * 60)); + final int s = (uptime - (h * 3600)) - (m * 60); return h + "hrs " + m + "mins " + s + "secs"; } diff --git a/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java b/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java index 210d0bd3e8..a2fadd1e6e 100644 --- a/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java +++ b/trunk/dist/game/data/scripts/handlers/telnethandlers/StatusHandler.java @@ -228,7 +228,7 @@ public class StatusHandler implements ITelnetHandler uptime = uptime / 1000; final int h = uptime / 3600; final int m = (uptime - (h * 3600)) / 60; - final int s = ((uptime - (h * 3600)) - (m * 60)); + final int s = (uptime - (h * 3600)) - (m * 60); return h + "hrs " + m + "mins " + s + "secs"; } diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java index 715a02dd5b..5259eea13a 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java @@ -61,7 +61,7 @@ public final class ExperienceGain implements IVoicedCommandHandler private TerminateReturn onExperienceReceived(L2Playable playable, long exp) { - if (playable.isPlayer() && (playable.getActingPlayer().isDead())) + if (playable.isPlayer() && playable.getActingPlayer().isDead()) { return new TerminateReturn(false, false, false); } diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java index 8453964e33..d50fdc327f 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java @@ -56,7 +56,7 @@ public class Unstuck implements IUserCommandHandler return false; } - final int unstuckTimer = (activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000); + final int unstuckTimer = activeChar.getAccessLevel().isGm() ? 1000 : Config.UNSTUCK_INTERVAL * 1000; if (activeChar.isInOlympiadMode()) { @@ -87,16 +87,13 @@ public class Unstuck implements IUserCommandHandler activeChar.doCast(escape); return true; } + else if (Config.UNSTUCK_INTERVAL > 100) + { + activeChar.sendMessage("You use Escape: " + (unstuckTimer / 60000) + " minutes."); + } else { - if (Config.UNSTUCK_INTERVAL > 100) - { - activeChar.sendMessage("You use Escape: " + (unstuckTimer / 60000) + " minutes."); - } - else - { - activeChar.sendMessage("You use Escape: " + (unstuckTimer / 1000) + " seconds."); - } + activeChar.sendMessage("You use Escape: " + (unstuckTimer / 1000) + " seconds."); } activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); // SoE Animation section diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java index 79215f7605..19620102f9 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/ChangePassword.java @@ -57,7 +57,7 @@ public class ChangePassword implements IVoicedCommandHandler repeatnewpass = st.nextToken(); } - if (!((curpass == null) || (newpass == null) || (repeatnewpass == null))) + if ((curpass != null) && (newpass != null) && (repeatnewpass != null)) { if (!newpass.equals(repeatnewpass)) { diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java index 88f35105b1..dbe00051dc 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Premium.java @@ -38,10 +38,11 @@ public class Premium implements IVoicedCommandHandler { final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); final long endDate = PremiumManager.getInstance().getPremiumEndDate(activeChar.getAccountName()); + final NpcHtmlMessage msg = new NpcHtmlMessage(5); + final StringBuilder html = new StringBuilder(); if (endDate == 0) { - final NpcHtmlMessage msg = new NpcHtmlMessage(5); - final StringBuilder html = new StringBuilder("Account Details
"); + html.append("Account Details
"); html.append("
Name:Level:Id:
"); html.append(""); html.append(""); @@ -56,15 +57,10 @@ public class Premium implements IVoicedCommandHandler html.append(""); html.append(""); html.append(""); - html.append("
Account Status: Normal
Rate XP: x" + Config.RATE_XP + "
1. Premium benefits CAN NOT BE TRANSFERED.
2. Premium does not effect party members.
3. Premium benefits effect ALL characters in same account.
"); - html.append(""); - msg.setHtml(html.toString()); - activeChar.sendPacket(msg); } else { - final NpcHtmlMessage msg = new NpcHtmlMessage(5); - final StringBuilder html = new StringBuilder("Premium Account Details
"); + html.append("Premium Account Details
"); html.append(""); html.append(""); html.append(""); @@ -78,11 +74,11 @@ public class Premium implements IVoicedCommandHandler html.append(""); html.append(""); html.append(""); - html.append("
Account Status: Premium
Rate XP: x" + (Config.RATE_XP * Config.PREMIUM_RATE_XP) + "
2. Premium does not effect party members.
3. Premium account effects ALL characters in same account.


Thank you for supporting our server.
"); - html.append("
"); - msg.setHtml(html.toString()); - activeChar.sendPacket(msg); } + html.append(""); + html.append("
"); + msg.setHtml(html.toString()); + activeChar.sendPacket(msg); } else { diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java index b46f29d6de..b73e079ef9 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/StatsVCmd.java @@ -45,7 +45,7 @@ public class StatsVCmd implements IVoicedCommandHandler } final L2PcInstance pc = L2World.getInstance().getPlayer(params); - if ((pc == null)) + if (pc == null) { activeChar.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE); return false; diff --git a/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index 45019cb9cb..537a033b0f 100644 --- a/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -215,8 +215,8 @@ public final class CavernOfThePirateCaptain extends AbstractInstance final boolean is83 = templateId == TEMPLATE_ID_83; final L2Party party = player.getParty(); final boolean isInCC = party.isInCommandChannel(); - final List members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers(); - final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player); + final List members = isInCC ? party.getCommandChannel().getMembers() : party.getMembers(); + final boolean isPartyLeader = isInCC ? party.getCommandChannel().isLeader(player) : party.isLeader(player); if (!isPartyLeader) { @@ -244,7 +244,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance return false; } - if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(groupMembers.getObjectId(), (is83 ? TEMPLATE_ID_83 : TEMPLATE_ID_60))) + if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(groupMembers.getObjectId(), is83 ? TEMPLATE_ID_83 : TEMPLATE_ID_60)) { broadcastSystemMessage(player, groupMembers, SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, true); return false; @@ -291,7 +291,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof CavernOfThePirateCaptainWorld)) + if (tmpworld instanceof CavernOfThePirateCaptainWorld) { final CavernOfThePirateCaptainWorld world = (CavernOfThePirateCaptainWorld) tmpworld; @@ -365,7 +365,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof CavernOfThePirateCaptainWorld)) + if (tmpworld instanceof CavernOfThePirateCaptainWorld) { final CavernOfThePirateCaptainWorld world = (CavernOfThePirateCaptainWorld) tmpworld; @@ -373,7 +373,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { for (L2PcInstance playersInside : world.playersInside) { - if ((playersInside != null) && ((playersInside.getInstanceId() == world.getInstanceId()) && playersInside.isInsideRadius(npc, 1500, true, true))) + if ((playersInside != null) && (playersInside.getInstanceId() == world.getInstanceId()) && playersInside.isInsideRadius(npc, 1500, true, true)) { final long time = System.currentTimeMillis() - world.storeTime; if (time <= 300000) // 5 minutes @@ -407,7 +407,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof CavernOfThePirateCaptainWorld)) + if (tmpworld instanceof CavernOfThePirateCaptainWorld) { final CavernOfThePirateCaptainWorld world = (CavernOfThePirateCaptainWorld) tmpworld; final boolean isBlue = npc.getVariables().getInt("isBlue", 0) == 1; diff --git a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index 5a247fd4ee..dd18f1f7f0 100644 --- a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -196,12 +196,12 @@ abstract class Chamber extends AbstractInstance private boolean isBigChamber() { - return ((INSTANCEID == 131) || (INSTANCEID == 132)); + return (INSTANCEID == 131) || (INSTANCEID == 132); } private boolean isBossRoom(CDWorld world) { - return (world.currentRoom == (ROOM_ENTER_POINTS.length - 1)); + return world.currentRoom == (ROOM_ENTER_POINTS.length - 1); } @Override @@ -435,7 +435,7 @@ abstract class Chamber extends AbstractInstance final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) { - world.removeAllowed((player.getObjectId())); + world.removeAllowed(player.getObjectId()); } } @@ -568,7 +568,7 @@ abstract class Chamber extends AbstractInstance public String onKill(L2Npc npc, L2PcInstance player, boolean isPet) { final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(player); - if ((tmpworld != null) && (tmpworld instanceof CDWorld)) + if (tmpworld instanceof CDWorld) { final CDWorld world = (CDWorld) tmpworld; final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); diff --git a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 814b9dcae1..e44325215d 100644 --- a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -133,7 +133,7 @@ public final class CrystalCaverns extends AbstractInstance private static final int CONT_CRYSTAL = 9690; // Contaminated Crystal private static final int RED_CORAL = 9692; // Red Coral private static final int CRYSTALFOOD = 9693; // Food item for Crystal Golems - final private static int RACE_KEY = 9694; // Race Key for Emerald doors + private static final int RACE_KEY = 9694; // Race Key for Emerald doors private static final int BOSS_CRYSTAL_1 = 9695; // Clear Crystal private static final int BOSS_CRYSTAL_2 = 9696; // Clear Crystal private static final int BOSS_CRYSTAL_3 = 9697; // Clear Crystal @@ -165,7 +165,7 @@ public final class CrystalCaverns extends AbstractInstance private static final int KECHIGUARD = 25533; private static final int BAYLOR = 29099; private static final int DARNEL = 25531; - private final static int ALARMID = 18474; + private static final int ALARMID = 18474; // private static final int[] BOSSCR = {9695,9696,9697}; private static final int[] CGMOBS = { @@ -216,7 +216,6 @@ public final class CrystalCaverns extends AbstractInstance private static final Location START_LOC = new Location(143348, 148707, -11972); // Misc private static final int TEMPLATE_ID = 10; - private static final boolean debug = false; private static final int DOOR1 = 24220021; private static final int DOOR2 = 24220024; private static final int DOOR3 = 24220023; @@ -230,7 +229,7 @@ public final class CrystalCaverns extends AbstractInstance 20107 }; // @formatter:off - private final static int[][] ALARMSPAWN = + private static final int[][] ALARMSPAWN = { {153572, 141277, -12738}, {153572, 142852, -12738}, @@ -512,7 +511,7 @@ public final class CrystalCaverns extends AbstractInstance @Override protected boolean checkConditions(L2PcInstance player) { - if (debug || player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) + if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) { return true; } @@ -565,10 +564,6 @@ public final class CrystalCaverns extends AbstractInstance private boolean checkOracleConditions(L2PcInstance player) { - if (debug) - { - return true; - } final L2Party party = player.getParty(); if (party == null) { @@ -1054,11 +1049,7 @@ public final class CrystalCaverns extends AbstractInstance } else if (!world.copys.isEmpty()) { - boolean notAOE = true; - if ((skill != null) && ((skill.getTargetType() == L2TargetType.AREA) || (skill.getTargetType() == L2TargetType.FRONT_AREA) || (skill.getTargetType() == L2TargetType.BEHIND_AREA) || (skill.getTargetType() == L2TargetType.AURA) || (skill.getTargetType() == L2TargetType.FRONT_AURA) || (skill.getTargetType() == L2TargetType.BEHIND_AURA))) - { - notAOE = false; - } + boolean notAOE = (skill == null) || ((skill.getTargetType() != L2TargetType.AREA) && (skill.getTargetType() != L2TargetType.FRONT_AREA) && (skill.getTargetType() != L2TargetType.BEHIND_AREA) && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA)); if (notAOE) { for (L2Npc copy : world.copys) @@ -1208,7 +1199,7 @@ public final class CrystalCaverns extends AbstractInstance else if (event.equalsIgnoreCase("spawn_oracle")) { addSpawn(32271, 153572, 142075, -9728, 10800, false, 0, false, world.getInstanceId()); - addSpawn((getRandom(10) < 5 ? 29116 : 29117), npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0, false, world.getInstanceId()); // Baylor's Chest + addSpawn(getRandom(10) < 5 ? 29116 : 29117, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0, false, world.getInstanceId()); // Baylor's Chest addSpawn(ORACLE_GUIDE_4, 153572, 142075, -12738, 10800, false, 0, false, world.getInstanceId()); cancelQuestTimer("baylor_despawn", npc, null); cancelQuestTimers("baylor_skill"); @@ -1749,7 +1740,7 @@ public final class CrystalCaverns extends AbstractInstance npc.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ())); final Instance baylorInstance = InstanceManager.getInstance().getInstance(npc.getInstanceId()); baylorInstance.setDuration(300000); - this.startQuestTimer("spawn_oracle", 1000, npc, null); + startQuestTimer("spawn_oracle", 1000, npc, null); giveRewards(player, npc.getInstanceId(), -1, true); } } @@ -1908,18 +1899,13 @@ public final class CrystalCaverns extends AbstractInstance { world._raiders.clear(); final L2Party party = player.getParty(); - if (party == null) + if (party != null) { - world._raiders.add(player); + world._raiders.addAll(party.getMembers()); } else { - for (L2PcInstance partyMember : party.getMembers()) - { - // int rnd = getRandom(100); - // partyMember.destroyItemByItemId("Quest", (rnd < 33 ? BOSS_CRYSTAL_1:(rnd < 67 ? BOSS_CRYSTAL_2:BOSS_CRYSTAL_3)), 1, partyMember, true); Crystals are no longer beign cunsumed while entering to Baylor Lair. - world._raiders.add(partyMember); - } + world._raiders.add(player); } } else @@ -1976,7 +1962,7 @@ public final class CrystalCaverns extends AbstractInstance if (trap.getId() == DOOR_OPENING_TRAP[0]) { openDoor(24220001, ((CCWorld) tmpworld).getInstanceId()); - runEmeraldRooms(((CCWorld) tmpworld), ROOM1_SPAWNS, 1); + runEmeraldRooms((CCWorld) tmpworld, ROOM1_SPAWNS, 1); } break; } diff --git a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index d9de013cfb..80580ce239 100644 --- a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -794,12 +794,9 @@ public final class DarkCloudMansion extends AbstractInstance decayedSamples += 1; mob.count = 2; } - else + else if (mob.count == 2) { - if (mob.count == 2) - { - decayedSamples += 1; - } + decayedSamples += 1; } } @@ -819,16 +816,13 @@ public final class DarkCloudMansion extends AbstractInstance startQuestTimer("respawnFifth", 6000, npc, null); } } - else + else if ((FifthRoom.reset == 0) && (FifthRoom.founded == 3)) { - if ((FifthRoom.reset == 0) && (FifthRoom.founded == 3)) + for (DMCNpc mob : FifthRoom.npcList) { - for (DMCNpc mob : FifthRoom.npcList) - { - mob.npc.decayMe(); - } - endInstance(world); + mob.npc.decayMe(); } + endInstance(world); } } diff --git a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 9fe0460b36..4d462428aa 100644 --- a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -185,7 +185,6 @@ public final class FinalEmperialTomb extends AbstractInstance private static final int MAX_PLAYERS = 45; private static final int TIME_BETWEEN_DEMON_SPAWNS = 20000; private static final int MAX_DEMONS = 24; - private static final boolean debug = false; private final Map _spawnZoneList = new HashMap<>(); private final Map> _spawnList = new HashMap<>(); private final List _mustKillMobsId = new ArrayList<>(); @@ -436,17 +435,12 @@ public final class FinalEmperialTomb extends AbstractInstance { _log.log(Level.WARNING, "[Final Emperial Tomb] Could not parse final_emperial_tomb.xml file: " + e.getMessage(), e); } - if (debug) - { - _log.info("[Final Emperial Tomb] Loaded " + _spawnZoneList.size() + " spawn zones data."); - _log.info("[Final Emperial Tomb] Loaded " + spawnCount + " spawns data."); - } } @Override protected boolean checkConditions(L2PcInstance player) { - if (debug || player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) + if (player.canOverrideCond(PcCondOverride.INSTANCE_CONDITIONS)) { return true; } @@ -585,10 +579,6 @@ public final class FinalEmperialTomb extends AbstractInstance { try { - if (debug) - { - _log.info("[Final Emperial Tomb] Starting " + world.getStatus() + ". status."); - } world.npcList.clear(); switch (world.getStatus()) { @@ -731,10 +721,6 @@ public final class FinalEmperialTomb extends AbstractInstance { if ((InstanceManager.getInstance().getWorld(_world.getInstanceId()) != _world) || _world.portraits.isEmpty()) { - if (debug) - { - _log.info("[Final Emperial Tomb] Instance is deleted or all Portraits is killed."); - } return; } for (int i : _world.portraits.values()) @@ -1480,10 +1466,6 @@ public final class FinalEmperialTomb extends AbstractInstance if (npc.getId() == HALL_ALARM) { ThreadPoolManager.getInstance().scheduleGeneral(new StatusTask(world, 0), 2000); - if (debug) - { - _log.info("[Final Emperial Tomb] Hall alarm is disabled, doors will open!"); - } } else if (npc.getId() == DARK_CHOIR_PLAYER) { @@ -1491,10 +1473,6 @@ public final class FinalEmperialTomb extends AbstractInstance if (world.darkChoirPlayerCount < 1) { ThreadPoolManager.getInstance().scheduleGeneral(new StatusTask(world, 2), 2000); - if (debug) - { - _log.info("[Final Emperial Tomb] All Dark Choir Players are killed, doors will open!"); - } } } else if (npc.getId() == SCARLET2) diff --git a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 5b8e1471cd..804c480df9 100644 --- a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -542,7 +542,7 @@ public final class HarnakUndergroundRuins extends AbstractInstance public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final InstanceWorld tmpworld = InstanceManager.getInstance().getPlayerWorld(killer); - if ((tmpworld instanceof HuRWorld)) + if (tmpworld instanceof HuRWorld) { final HuRWorld world = (HuRWorld) tmpworld; if (world.isStatus(0)) @@ -708,7 +708,7 @@ public final class HarnakUndergroundRuins extends AbstractInstance case KRAKIA_LOTUS: case WEISS_ELE: { - if ((npc.getId() != world.currentNpc)) + if (npc.getId() != world.currentNpc) { for (L2Npc livingNpc : world.spawnedNpc) { diff --git a/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java index bffa2630c2..411e48e96c 100644 --- a/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java +++ b/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java @@ -119,7 +119,7 @@ public final class IceQueensCastle extends AbstractInstance case "TIMER_PC_LEAVE": { final QuestState qs = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName()); - if ((qs != null)) + if (qs != null) { qs.setMemoState(3); qs.setCond(10, true); @@ -165,7 +165,7 @@ public final class IceQueensCastle extends AbstractInstance public String onSpellFinished(L2Npc npc, L2PcInstance player, Skill skill) { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof IQCWorld) && (skill == ETHERNAL_BLIZZARD.getSkill()) && (((IQCWorld) tmpworld).player != null)) + if ((tmpworld instanceof IQCWorld) && (skill == ETHERNAL_BLIZZARD.getSkill()) && (((IQCWorld) tmpworld).player != null)) { startQuestTimer("TIMER_SCENE_21", 1000, npc, ((IQCWorld) tmpworld).player); } diff --git a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index 20cb3f3143..425ca671ef 100644 --- a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -203,7 +203,7 @@ public final class IceQueensCastleBattle extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof IQCNBWorld)) + if (tmpworld instanceof IQCNBWorld) { final IQCNBWorld world = (IQCNBWorld) tmpworld; switch (event) @@ -339,7 +339,7 @@ public final class IceQueensCastleBattle extends AbstractInstance } } - final L2RaidBossInstance glakias = (L2RaidBossInstance) addSpawn((world.isHardCore ? GLAKIAS_HARD : GLAKIAS_EASY), GLAKIAS_SPAWN, false, 0, true, world.getInstanceId()); + final L2RaidBossInstance glakias = (L2RaidBossInstance) addSpawn(world.isHardCore ? GLAKIAS_HARD : GLAKIAS_EASY, GLAKIAS_SPAWN, false, 0, true, world.getInstanceId()); startQuestTimer("LEADER_DELAY", 5000, glakias, null); if (world.isHardCore) @@ -382,7 +382,7 @@ public final class IceQueensCastleBattle extends AbstractInstance world.setStatus(4); world.freya.deleteMe(); world.canSpawnMobs = true; - world.freya = (L2GrandBossInstance) addSpawn((world.isHardCore ? FREYA_STAND_HARD : FREYA_STAND_EASY), FREYA_SPAWN, false, 0, true, world.getInstanceId()); + world.freya = (L2GrandBossInstance) addSpawn(world.isHardCore ? FREYA_STAND_HARD : FREYA_STAND_EASY, FREYA_SPAWN, false, 0, true, world.getInstanceId()); world.controller.getVariables().set("FREYA_MOVE", 0); notifyEvent("START_SPAWN", world.controller, null); startQuestTimer("START_MOVE", 10000, world.controller, null); @@ -426,7 +426,7 @@ public final class IceQueensCastleBattle extends AbstractInstance } else { - final Skill skill = (world.isHardCore ? BLIZZARD_HARD.getSkill() : BLIZZARD_EASY.getSkill()); + final Skill skill = world.isHardCore ? BLIZZARD_HARD.getSkill() : BLIZZARD_EASY.getSkill(); world.freya.doCast(skill); manageScreenMsg(world, NpcStringId.STRONG_MAGIC_POWER_CAN_BE_FELT_FROM_SOMEWHERE); } @@ -498,7 +498,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (Location loc : KNIGHTS_LOC) { - final L2Attackable knight = (L2Attackable) addSpawn((world.isHardCore ? KNIGHT_HARD : KNIGHT_EASY), loc, false, 0, false, world.getInstanceId()); + final L2Attackable knight = (L2Attackable) addSpawn(world.isHardCore ? KNIGHT_HARD : KNIGHT_EASY, loc, false, 0, false, world.getInstanceId()); knight.disableCoreAI(true); knight.setDisplayEffect(1); knight.getSpawn().setLocation(loc); @@ -525,7 +525,7 @@ public final class IceQueensCastleBattle extends AbstractInstance knight.getSpawn().setLocation(loc); world.spawnedMobs.add(knight); - startQuestTimer("ICE_RUPTURE", ((world.isHardCore ? getRandom(5, 10) : getRandom(15, 20)) * 1000), knight, null); + startQuestTimer("ICE_RUPTURE", (world.isHardCore ? getRandom(5, 10) : getRandom(15, 20)) * 1000, knight, null); } break; } @@ -628,7 +628,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (L2PcInstance players : world.playersInside) { - if ((players != null)) + if (players != null) { players.broadcastPacket(ExChangeClientEffectInfo.STATIC_FREYA_DEFAULT); } @@ -656,7 +656,7 @@ public final class IceQueensCastleBattle extends AbstractInstance for (L2Character characters : npc.getKnownList().getKnownPlayersInRadius(1000)) { - if ((characters != null)) + if (characters != null) { mob.addDamageHate(characters, 0, getRandom(10000, 20000)); } @@ -819,13 +819,10 @@ public final class IceQueensCastleBattle extends AbstractInstance npc.doCast(ICE_BALL.getSkill()); } } - else + else if (canReachMostHated && npc.checkDoCastConditions(ICE_BALL.getSkill()) && !npc.isCastingNow()) { - if (canReachMostHated && npc.checkDoCastConditions(ICE_BALL.getSkill()) && !npc.isCastingNow()) - { - npc.setTarget(mostHated); - npc.doCast(ICE_BALL.getSkill()); - } + npc.setTarget(mostHated); + npc.doCast(ICE_BALL.getSkill()); } } else if (getRandom(10000) < 800) @@ -838,13 +835,10 @@ public final class IceQueensCastleBattle extends AbstractInstance npc.doCast(SUMMON_ELEMENTAL.getSkill()); } } - else + else if (canReachMostHated && npc.checkDoCastConditions(SUMMON_ELEMENTAL.getSkill()) && !npc.isCastingNow()) { - if (canReachMostHated && npc.checkDoCastConditions(SUMMON_ELEMENTAL.getSkill()) && !npc.isCastingNow()) - { - npc.setTarget(mostHated); - npc.doCast(SUMMON_ELEMENTAL.getSkill()); - } + npc.setTarget(mostHated); + npc.doCast(SUMMON_ELEMENTAL.getSkill()); } } else if ((getRandom(10000) < 1500) && !npc.isAffectedBySkill(SELF_NOVA.getSkillId()) && npc.checkDoCastConditions(SELF_NOVA.getSkill()) && !npc.isCastingNow()) @@ -898,13 +892,10 @@ public final class IceQueensCastleBattle extends AbstractInstance npc.doCast(ICE_BALL.getSkill()); } } - else + else if (canReachMostHated && npc.checkDoCastConditions(ICE_BALL.getSkill()) && !npc.isCastingNow()) { - if (canReachMostHated && npc.checkDoCastConditions(ICE_BALL.getSkill()) && !npc.isCastingNow()) - { - npc.setTarget(mostHated); - npc.doCast(ICE_BALL.getSkill()); - } + npc.setTarget(mostHated); + npc.doCast(ICE_BALL.getSkill()); } } else if (getRandom(10000) < 1333) @@ -917,13 +908,10 @@ public final class IceQueensCastleBattle extends AbstractInstance npc.doCast(SUMMON_ELEMENTAL.getSkill()); } } - else + else if (canReachMostHated && npc.checkDoCastConditions(SUMMON_ELEMENTAL.getSkill()) && !npc.isCastingNow()) { - if (canReachMostHated && npc.checkDoCastConditions(SUMMON_ELEMENTAL.getSkill()) && !npc.isCastingNow()) - { - npc.setTarget(mostHated); - npc.doCast(SUMMON_ELEMENTAL.getSkill()); - } + npc.setTarget(mostHated); + npc.doCast(SUMMON_ELEMENTAL.getSkill()); } } else if (getRandom(10000) < 1500) @@ -1083,7 +1071,7 @@ public final class IceQueensCastleBattle extends AbstractInstance } else { - manageRandomAttack(((IQCNBWorld) tmpworld), breath); + manageRandomAttack((IQCNBWorld) tmpworld, breath); } ((IQCNBWorld) tmpworld).spawnedMobs.add(breath); startQuestTimer("BLIZZARD", 20000, breath, null); @@ -1154,7 +1142,7 @@ public final class IceQueensCastleBattle extends AbstractInstance world.freya.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MIDDLE_POINT); } - if ((knightCount < 10) && (world.isStatus(2))) + if ((knightCount < 10) && world.isStatus(2)) { knightCount++; var.set("KNIGHT_COUNT", knightCount); @@ -1168,7 +1156,7 @@ public final class IceQueensCastleBattle extends AbstractInstance if (spawnedBy != null) { - startQuestTimer("SPAWN_KNIGHT", ((world.isHardCore ? getRandom(30, 60) : getRandom(50, 60)) * 1000), spawnedBy, null); + startQuestTimer("SPAWN_KNIGHT", (world.isHardCore ? getRandom(30, 60) : getRandom(50, 60)) * 1000, spawnedBy, null); } world.spawnedMobs.remove(npc); break; @@ -1310,7 +1298,7 @@ public final class IceQueensCastleBattle extends AbstractInstance } Collections.shuffle(players); - final L2PcInstance target = (!players.isEmpty()) ? players.get(0) : null; + final L2PcInstance target = !players.isEmpty() ? players.get(0) : null; if (target != null) { addAttackDesire(mob, target); diff --git a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index 03c86bac56..beccd075ba 100644 --- a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -1217,7 +1217,7 @@ public final class Kamaloka extends AbstractInstance * @param index (0-18) index of the kamaloka in arrays * @return true if party allowed to enter */ - private static final boolean checkPartyConditions(L2PcInstance player, int index) + private static boolean checkPartyConditions(L2PcInstance player, int index) { final L2Party party = player.getParty(); // player must be in party @@ -1294,7 +1294,7 @@ public final class Kamaloka extends AbstractInstance * Removing all buffs from player and pet except BUFFS_WHITELIST * @param ch player */ - private static final void removeBuffs(L2Character ch) + private static void removeBuffs(L2Character ch) { final Function removeBuffs = info -> { diff --git a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 9736d2ee49..9259525043 100644 --- a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -216,7 +216,7 @@ public final class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_party": { - if ((player.getParty() == null) || (!player.getParty().isLeader(player))) + if ((player.getParty() == null) || !player.getParty().isLeader(player)) { htmltext = "33647-7.htm"; } @@ -242,7 +242,7 @@ public final class KartiasLabyrinth extends AbstractInstance } case "request_pelline_party": { - if ((player.getParty() == null) || (!player.getParty().isLeader(player))) + if ((player.getParty() == null) || !player.getParty().isLeader(player)) { htmltext = "33647-7.htm"; } @@ -268,7 +268,7 @@ public final class KartiasLabyrinth extends AbstractInstance } case "request_kalios_party": { - if ((player.getParty() == null) || (!player.getParty().isLeader(player))) + if ((player.getParty() == null) || !player.getParty().isLeader(player)) { htmltext = "33647-7.htm"; } @@ -732,11 +732,7 @@ public final class KartiasLabyrinth extends AbstractInstance entryResetTime.set(Calendar.HOUR, 6); entryResetTime.set(Calendar.MINUTE, 30); entryResetTime.set(Calendar.AM_PM, Calendar.AM); - if (lastEntry < entryResetTime.getTimeInMillis()) - { - return true; - } - return false; + return lastEntry < entryResetTime.getTimeInMillis(); } private String removeVanguard(L2PcInstance player, int removedNpcId) diff --git a/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 73eaa4cee9..6b190041ac 100644 --- a/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -486,12 +486,9 @@ public final class LabyrinthOfBelis extends AbstractInstance { world.incStatus(); } - else + else if (getRandomBoolean()) { - if (getRandomBoolean()) - { - npc.dropItem(killer, BELIS_MARK, 1); - } + npc.dropItem(killer, BELIS_MARK, 1); } break; } diff --git a/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index a1c47a5dc7..96c500d2a7 100644 --- a/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -130,7 +130,7 @@ public final class MithrilMine extends AbstractInstance public String onFirstTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = player.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName()); - if ((qs != null)) + if (qs != null) { if (qs.isMemoState(2)) { @@ -155,7 +155,7 @@ public final class MithrilMine extends AbstractInstance public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { final InstanceWorld world = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - final MMWorld _world = ((MMWorld) world); + final MMWorld _world = (MMWorld) world; if (npc.getId() == KEGOR) { diff --git a/trunk/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java b/trunk/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java index 9934edd706..e97c3557c9 100644 --- a/trunk/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java +++ b/trunk/dist/game/data/scripts/instances/NightmareKamaloka/NightmareKamaloka.java @@ -165,7 +165,7 @@ public final class NightmareKamaloka extends AbstractInstance public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final InstanceWorld tmpWorld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpWorld != null) && (tmpWorld instanceof NKWorld)) + if (tmpWorld instanceof NKWorld) { final NKWorld world = (NKWorld) tmpWorld; switch (npc.getId()) diff --git a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index 3d2da95479..8d034075f8 100644 --- a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -205,7 +205,7 @@ public final class NornilsGarden extends AbstractInstance final InstanceWorld inst = InstanceManager.getInstance().getWorld(player.getInstanceId()); if (inst instanceof NornilsWorld) { - final NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = (NornilsWorld) inst; world.removeAllowed(player.getObjectId()); teleportPlayer(player, EXIT_PPL, 0); } @@ -239,7 +239,7 @@ public final class NornilsGarden extends AbstractInstance } // Creating new instance final String result = checkConditions(npc, player); - if (!(result.equalsIgnoreCase("ok"))) + if (!result.equalsIgnoreCase("ok")) { return result; } @@ -290,7 +290,7 @@ public final class NornilsGarden extends AbstractInstance final InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (inst instanceof NornilsWorld) { - final NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = (NornilsWorld) inst; if (npc.equals(world.first_npc) && !world.spawned_1) { world.spawned_1 = true; @@ -308,7 +308,7 @@ public final class NornilsGarden extends AbstractInstance final InstanceWorld inst = InstanceManager.getInstance().getWorld(npc.getInstanceId()); if (inst instanceof NornilsWorld) { - final NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = (NornilsWorld) inst; if (!world.spawned_2) { world.spawned_2 = true; @@ -326,7 +326,7 @@ public final class NornilsGarden extends AbstractInstance final InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); if (inst instanceof NornilsWorld) { - final NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = (NornilsWorld) inst; if (!world.spawned_3) { world.spawned_3 = true; @@ -344,7 +344,7 @@ public final class NornilsGarden extends AbstractInstance final InstanceWorld inst = InstanceManager.getInstance().getWorld(cha.getInstanceId()); if (inst instanceof NornilsWorld) { - final NornilsWorld world = ((NornilsWorld) inst); + final NornilsWorld world = (NornilsWorld) inst; if (!world.spawned_4) { world.spawned_4 = true; @@ -367,7 +367,7 @@ public final class NornilsGarden extends AbstractInstance } } - private static final String checkConditions(L2Npc npc, L2PcInstance player) + private static String checkConditions(L2Npc npc, L2PcInstance player) { final L2Party party = player.getParty(); // player must be in party @@ -428,7 +428,7 @@ public final class NornilsGarden extends AbstractInstance return "ok"; } - private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop) + private static void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop) { final int chance = getRandom(100); for (int[] element : drop) @@ -440,7 +440,7 @@ public final class NornilsGarden extends AbstractInstance } } - private static final void giveBuffs(L2Character ch) + private static void giveBuffs(L2Character ch) { if (skill1 != null) { diff --git a/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 14f242e41b..00e8fda215 100644 --- a/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -121,7 +121,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance htmltext = "32498-02.htm"; } } - else if ((tmpworld != null) && (tmpworld instanceof DIWorld)) + else if (tmpworld instanceof DIWorld) { final DIWorld world = (DIWorld) tmpworld; @@ -177,7 +177,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof DIWorld)) + if (tmpworld instanceof DIWorld) { switch (npc.getId()) { @@ -265,7 +265,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId()); - if ((tmpworld != null) && (tmpworld instanceof DIWorld)) + if (tmpworld instanceof DIWorld) { final DIWorld world = (DIWorld) tmpworld; @@ -285,7 +285,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance @Override public String onEnterZone(L2Character character, L2ZoneType zone) { - if ((character.isPlayer()) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) + if (character.isPlayer() && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character.getInstanceId()); if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) @@ -303,7 +303,7 @@ public final class PailakaDevilsLegacy extends AbstractInstance { for (L2Summon summon : character.getServitors().values()) { - if (((summon.getTemplate().getId() == TIGRESS_LVL1) || (summon.getTemplate().getId() == TIGRESS_LVL2))) + if ((summon.getTemplate().getId() == TIGRESS_LVL1) || (summon.getTemplate().getId() == TIGRESS_LVL2)) { if (!summon.isDead()) { diff --git a/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java index 03983a5278..03b9fb5641 100644 --- a/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java +++ b/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java @@ -172,7 +172,7 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance @Override public String onExitZone(L2Character character, L2ZoneType zone) { - if ((character.isPlayer()) && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) + if (character.isPlayer() && !character.isDead() && !character.isTeleporting() && ((L2PcInstance) character).isOnline()) { final InstanceWorld world = InstanceManager.getInstance().getWorld(character.getInstanceId()); if ((world != null) && (world.getTemplateId() == TEMPLATE_ID)) diff --git a/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java b/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java index ba086e8723..3352bbcd6b 100644 --- a/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java +++ b/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java @@ -75,7 +75,7 @@ public final class SanctumOftheLordsOfDawn extends AbstractInstance static final class HSWorld extends InstanceWorld { int doorst = 0; - final static Map> _save_point = new HashMap<>(); + static final Map> _save_point = new HashMap<>(); static Map> getMonsters() { diff --git a/trunk/dist/game/data/scripts/instances/TalkingIsland/TalkingIsland.java b/trunk/dist/game/data/scripts/instances/TalkingIsland/TalkingIsland.java index 0d6bbcce32..603cc735a4 100644 --- a/trunk/dist/game/data/scripts/instances/TalkingIsland/TalkingIsland.java +++ b/trunk/dist/game/data/scripts/instances/TalkingIsland/TalkingIsland.java @@ -201,17 +201,17 @@ public class TalkingIsland extends AbstractInstance { final QuestState qs = player.getQuestState(Q10385_RedThreadOfFate.class.getSimpleName()); String htmltext = null; - if ((qs != null)) + if (qs != null) { switch (npc.getId()) { case DARIN: { - if ((qs.isCond(19)) && qs.isMemoState(0)) + if (qs.isCond(19) && qs.isMemoState(0)) { htmltext = "33748-01.html"; } - else if ((qs.isCond(19)) && qs.isMemoState(1)) + else if (qs.isCond(19) && qs.isMemoState(1)) { htmltext = "33748-04.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/trunk/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java index d268884b9f..1bb6967381 100644 --- a/trunk/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java +++ b/trunk/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java @@ -112,7 +112,7 @@ public class Q00017_LightAndDarkness extends Quest case State.CREATED: { final QuestState qs2 = player.getQuestState(Q00015_SweetWhispers.class.getSimpleName()); - htmltext = ((qs2 != null) && (qs2.isCompleted())) ? "31517-00.htm" : "31517-06.html"; + htmltext = ((qs2 != null) && qs2.isCompleted()) ? "31517-00.htm" : "31517-06.html"; break; } case State.STARTED: diff --git a/trunk/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/trunk/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java index 78596896de..539b1a9e72 100644 --- a/trunk/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java +++ b/trunk/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java @@ -122,7 +122,7 @@ public class Q00019_GoToThePastureland extends Quest } } } - else if ((npc.getId() == TUNATUN) && (qs.isCond(1))) + else if ((npc.getId() == TUNATUN) && qs.isCond(1)) { htmltext = "31537-01.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/trunk/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java index c7ddc62c5f..9ce0347f50 100644 --- a/trunk/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java +++ b/trunk/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java @@ -123,7 +123,7 @@ public class Q00020_BringUpWithLove extends Quest } case 2: { - htmltext = (!hasQuestItems(player, INNOCENCE_JEWEL)) ? "31537-14.html" : "31537-15.html"; + htmltext = !hasQuestItems(player, INNOCENCE_JEWEL) ? "31537-14.html" : "31537-15.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/trunk/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java index a333ed2a9c..8004e7dcc2 100644 --- a/trunk/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java +++ b/trunk/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java @@ -129,7 +129,7 @@ public final class Q00026_TiredOfWaiting extends Quest { if (qs.isCreated()) { - htmltext = ((player.getLevel() >= 80) ? "30655-01.htm" : "30655-00.html"); + htmltext = (player.getLevel() >= 80) ? "30655-01.htm" : "30655-00.html"; } else if (qs.isStarted()) { @@ -145,7 +145,7 @@ public final class Q00026_TiredOfWaiting extends Quest { if (qs.isStarted()) { - htmltext = (hasQuestItems(player, DELIVERY_BOX) ? "31045-01.html" : "31045-09.html"); + htmltext = hasQuestItems(player, DELIVERY_BOX) ? "31045-01.html" : "31045-09.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/trunk/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index 36f6a7ebd2..dd6cae99b6 100644 --- a/trunk/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/trunk/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -193,7 +193,7 @@ public final class Q00032_AnObviousLie extends Quest { if (qs.isCreated()) { - htmltext = ((player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm"); + htmltext = (player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm"; } else if (qs.isStarted()) { @@ -224,12 +224,12 @@ public final class Q00032_AnObviousLie extends Quest } case 4: { - htmltext = (hasItem(player, MEDICINAL_HERB) ? "30094-04.html" : "30094-05.html"); + htmltext = hasItem(player, MEDICINAL_HERB) ? "30094-04.html" : "30094-05.html"; break; } case 5: { - htmltext = (hasItem(player, SPIRIT_ORE) ? "30094-07.html" : "30094-08.html"); + htmltext = hasItem(player, SPIRIT_ORE) ? "30094-07.html" : "30094-08.html"; break; } case 6: diff --git a/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index 286b4fdd66..45a6c5ca50 100644 --- a/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -223,7 +223,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest final ItemChanceHolder item = MOBS_DROP_CHANCES.get(npc.getId()); if (item.getCount() == qs.getMemoState()) { - if (qs.isCond(4) && (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, 50, item.getChance(), true))) + if (qs.isCond(4) && giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, 50, item.getChance(), true)) { qs.setCond(5); } @@ -260,7 +260,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest { if (npc.getId() == MARQUEZ) { - htmltext = ((player.getLevel() >= MIN_LEVEL) ? "32113-01.htm" : "32113-06.html"); + htmltext = (player.getLevel() >= MIN_LEVEL) ? "32113-01.htm" : "32113-06.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/trunk/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java index 327901e7fd..0a30897591 100644 --- a/trunk/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java +++ b/trunk/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java @@ -187,7 +187,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest } case "32018-05.html": { - if (qs.isCond(6) && (hasQuestItems(player, RAFFORTYS_LETTER))) + if (qs.isCond(6) && hasQuestItems(player, RAFFORTYS_LETTER)) { takeItems(player, RAFFORTYS_LETTER, -1); qs.setCond(7, true); @@ -422,7 +422,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest } case 2: { - htmltext = (!hasQuestItems(player, MISAS_LETTER)) ? "32020-05.html" : "32020-06.html"; + htmltext = !hasQuestItems(player, MISAS_LETTER) ? "32020-05.html" : "32020-06.html"; break; } case 3: diff --git a/trunk/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java b/trunk/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java index 08f0acbb90..b9772ac48e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java +++ b/trunk/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java @@ -1203,12 +1203,9 @@ public final class Q00120_PavelsLastResearch extends Quest } } } - else + else if (checkQ114(player)) { - if (checkQ114(player)) - { - html = getAlreadyCompletedMsg(player); - } + html = getAlreadyCompletedMsg(player); } break; } @@ -1476,6 +1473,6 @@ public final class Q00120_PavelsLastResearch extends Quest private static boolean checkQ114(L2PcInstance player) { final QuestState q114 = player.getQuestState(Q00114_ResurrectionOfAnOldManager.class.getSimpleName()); - return ((q114 != null) && q114.isCompleted()); + return (q114 != null) && q114.isCompleted(); } } diff --git a/trunk/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/trunk/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java index 821a622a23..933e6673ec 100644 --- a/trunk/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java +++ b/trunk/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java @@ -152,22 +152,19 @@ public class Q00134_TempleMissionary extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } - else + else if (hasQuestItems(player, GIANTS_EXPERIMENTAL_TOOL)) { - if (hasQuestItems(player, GIANTS_EXPERIMENTAL_TOOL)) + takeItems(player, GIANTS_EXPERIMENTAL_TOOL, 1); + if (getRandom(100) != 0) { - takeItems(player, GIANTS_EXPERIMENTAL_TOOL, 1); - if (getRandom(100) != 0) - { - addSpawn(CRUMA_MARSHLANDS_TRAITOR, npc.getX() + 20, npc.getY() + 20, npc.getZ(), npc.getHeading(), false, 60000); - } - } - else if (getRandom(100) < MOBS.get(npc.getId())) - { - giveItems(player, GIANTS_EXPERIMENTAL_TOOL_FRAGMENT, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + addSpawn(CRUMA_MARSHLANDS_TRAITOR, npc.getX() + 20, npc.getY() + 20, npc.getZ(), npc.getHeading(), false, 60000); } } + else if (getRandom(100) < MOBS.get(npc.getId())) + { + giveItems(player, GIANTS_EXPERIMENTAL_TOOL_FRAGMENT, 1); + playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } return super.onKill(npc, player, isSummon); } diff --git a/trunk/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/trunk/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java index 721074f263..223f2d55b3 100644 --- a/trunk/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java +++ b/trunk/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java @@ -136,7 +136,7 @@ public class Q00135_TempleExecutor extends Quest return super.onKill(npc, player, isSummon); } final QuestState qs = getQuestState(member, false); - if ((getRandom(1000) < MOBS.get(npc.getId()))) + if (getRandom(1000) < MOBS.get(npc.getId())) { if (getQuestItemsCount(player, STOLEN_CARGO) < ITEM_COUNT) { diff --git a/trunk/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/trunk/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java index 6d7c9ba0d0..5680de516b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java +++ b/trunk/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java @@ -86,7 +86,7 @@ public class Q00137_TempleChampionPart1 extends Quest } case "30070-16.html": { - if (qs.isCond(3) && (hasQuestItems(player, EXECUTOR) && hasQuestItems(player, MISSIONARY))) + if (qs.isCond(3) && hasQuestItems(player, EXECUTOR) && hasQuestItems(player, MISSIONARY)) { takeItems(player, EXECUTOR, -1); takeItems(player, MISSIONARY, -1); diff --git a/trunk/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/trunk/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java index 62de1f86ab..0ce5c87ef0 100644 --- a/trunk/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java @@ -76,7 +76,7 @@ public class Q00138_TempleChampionPart2 extends Quest case "30070-05.html": { giveAdena(player, 84593, true); - if ((player.getLevel() < 42)) + if (player.getLevel() < 42) { addExpAndSp(player, 187062, 11307); } diff --git a/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index b0595b1953..e7e324ef66 100644 --- a/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -178,12 +178,12 @@ public class Q00139_ShadowFoxPart1 extends Quest { case 1: { - htmltext = (qs.isSet("talk")) ? "30896-11.html" : "30896-05.html"; + htmltext = qs.isSet("talk") ? "30896-11.html" : "30896-05.html"; break; } case 2: { - htmltext = (qs.isSet("talk")) ? "30896-18.html" : ((getQuestItemsCount(player, FRAGMENT) >= 10) && (getQuestItemsCount(player, CHEST) >= 1)) ? "30896-15.html" : "30896-14.html"; + htmltext = qs.isSet("talk") ? "30896-18.html" : ((getQuestItemsCount(player, FRAGMENT) >= 10) && (getQuestItemsCount(player, CHEST) >= 1)) ? "30896-15.html" : "30896-14.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/trunk/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java index c917862163..0ceb72a593 100644 --- a/trunk/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java @@ -239,7 +239,7 @@ public class Q00140_ShadowFoxPart2 extends Quest } case 2: { - htmltext = (qs.isSet("talk")) ? "30912-07.html" : "30912-02.html"; + htmltext = qs.isSet("talk") ? "30912-07.html" : "30912-02.html"; break; } case 3: diff --git a/trunk/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/trunk/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java index e45ac89106..1fb15f661f 100644 --- a/trunk/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java +++ b/trunk/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java @@ -143,7 +143,7 @@ public class Q00141_ShadowFoxPart3 extends Quest return super.onKill(npc, player, isSummon); } final QuestState qs = getQuestState(member, false); - if ((getRandom(100) < MOBS.get(npc.getId()))) + if (getRandom(100) < MOBS.get(npc.getId())) { giveItems(member, PREDECESSORS_REPORT, 1); if (getQuestItemsCount(member, PREDECESSORS_REPORT) >= REPORT_COUNT) diff --git a/trunk/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/trunk/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java index e728a13ff3..798d7cf0e4 100644 --- a/trunk/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java +++ b/trunk/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java @@ -154,7 +154,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { final QuestState qs; - if ((npc.getId() == FALLEN_ANGEL)) + if (npc.getId() == FALLEN_ANGEL) { qs = getQuestState(player, false); if (qs.isCond(5)) diff --git a/trunk/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/trunk/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java index 8af6b05f20..ecf140df30 100644 --- a/trunk/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java +++ b/trunk/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java @@ -218,7 +218,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest } case 2: { - htmltext = (qs.isSet("talk")) ? "30297-04.html" : "30297-02.html"; + htmltext = qs.isSet("talk") ? "30297-04.html" : "30297-02.html"; break; } case 3: @@ -256,7 +256,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest } case 3: { - htmltext = (qs.isSet("talk")) ? "30612-04.html" : "30612-02.html"; + htmltext = qs.isSet("talk") ? "30612-04.html" : "30612-02.html"; break; } default: diff --git a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 3801e96285..fdc15e520a 100644 --- a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -810,7 +810,7 @@ public class Q00144_PailakaInjuredDragon extends Quest } } - private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop) + private static void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop) { final int chance = Rnd.get(100); for (int[] element : drop) @@ -823,7 +823,7 @@ public class Q00144_PailakaInjuredDragon extends Quest } } - private static final void dropItem(L2Npc mob, L2PcInstance player) + private static void dropItem(L2Npc mob, L2PcInstance player) { // To make random drops, we shuffle the droplist every time its used. Collections.shuffle(DROPLIST); @@ -844,7 +844,7 @@ public class Q00144_PailakaInjuredDragon extends Quest buff_counter--; } - private static final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId) + private static void teleportPlayer(L2PcInstance player, int[] coords, int instanceId) { player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); player.setInstanceId(instanceId); diff --git a/trunk/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java b/trunk/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java index e23f492518..c5b33697fc 100644 --- a/trunk/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java +++ b/trunk/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java @@ -253,56 +253,53 @@ public class Q00177_SplitDestiny extends Quest { htmltext = "33344-12.htm"; } + else if (!player.isSubClassActive() || !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) || (player.getLevel() < 80)) + { + htmltext = "33344-02.htm"; + } + else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId())) + { + htmltext = "33344-03.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE)) + { + htmltext = "33344-sigel.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.TYRR_CANDIDATE)) + { + htmltext = "33344-tyrr.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE)) + { + htmltext = "33344-othell.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.YUL_CANDIDATE)) + { + htmltext = "33344-yul.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.FEOH_CANDIDATE)) + { + htmltext = "33344-feoh.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.ISS_CANDIDATE)) + { + htmltext = "33344-iss.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.WYNN_CANDIDATE)) + { + htmltext = "33344-wynn.htm"; + } + else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.AEORE_CANDIDATE)) + { + htmltext = "33344-aeore.htm"; + } + else if (player.hasDualClass()) + { + htmltext = "33344-12.htm"; + } else { - if (!player.isSubClassActive() || !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) || (player.getLevel() < 80)) - { - htmltext = "33344-02.htm"; - } - else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId())) - { - htmltext = "33344-03.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE)) - { - htmltext = "33344-sigel.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.TYRR_CANDIDATE)) - { - htmltext = "33344-tyrr.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE)) - { - htmltext = "33344-othell.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.YUL_CANDIDATE)) - { - htmltext = "33344-yul.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.FEOH_CANDIDATE)) - { - htmltext = "33344-feoh.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.ISS_CANDIDATE)) - { - htmltext = "33344-iss.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.WYNN_CANDIDATE)) - { - htmltext = "33344-wynn.htm"; - } - else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.AEORE_CANDIDATE)) - { - htmltext = "33344-aeore.htm"; - } - else if (player.hasDualClass()) - { - htmltext = "33344-12.htm"; - } - else - { - htmltext = "33344-01.htm"; - } + htmltext = "33344-01.htm"; } } else if ((npc.getId() == ISHUMA) && qs.isStarted()) diff --git a/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java index eaa84598ae..1ab7cb8a3b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java +++ b/trunk/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java @@ -246,7 +246,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest if (npc.getId() == HOLLINT) { qs = player.getQuestState(Q00192_SevenSignsSeriesOfDoubt.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "30191-01.htm" : "30191-03.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "30191-01.htm" : "30191-03.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/trunk/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java index 915c3b09e6..8fa2c4ba5d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java +++ b/trunk/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java @@ -235,7 +235,7 @@ public final class Q00195_SevenSignsSecretRitualOfThePriests extends Quest if (npc.getId() == CLAUDIA_ATHEBALDT) { qs = player.getQuestState(Q00194_SevenSignsMammonsContract.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "31001-01.htm" : "31001-02.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "31001-01.htm" : "31001-02.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java b/trunk/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java index 74c5e48b47..a728b63965 100644 --- a/trunk/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java +++ b/trunk/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java @@ -247,7 +247,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest if (npc.getId() == IASON_HEINE) { qs = player.getQuestState(Q00195_SevenSignsSecretRitualOfThePriests.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "30969-01.htm" : "30969-08.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "30969-01.htm" : "30969-08.html"; } break; } @@ -298,7 +298,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest { npc.setScriptValue(player.getObjectId()); } - htmltext = (npc.isScriptValue(player.getObjectId())) ? "32584-01.html" : "32584-06.html"; + htmltext = npc.isScriptValue(player.getObjectId()) ? "32584-01.html" : "32584-06.html"; } break; } @@ -358,7 +358,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest { if (qs.isCond(3) || qs.isCond(4)) { - htmltext = (!hasQuestItems(player, COURT_MAGICIANS_MAGIC_STAFF)) ? "32598-01.html" : "32598-03.html"; + htmltext = !hasQuestItems(player, COURT_MAGICIANS_MAGIC_STAFF) ? "32598-01.html" : "32598-03.html"; player.sendPacket(SystemMessageId.BY_USING_THE_COURT_WIZARD_S_MAGIC_STAFF_OPEN_THE_DOOR_ON_WHICH_THE_MAGICIAN_S_BARRIER_IS_PLACED); } break; diff --git a/trunk/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/trunk/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java index 8a921d974b..acb551f68a 100644 --- a/trunk/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java +++ b/trunk/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java @@ -257,7 +257,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest if (npc.getId() == WOOD) { qs = player.getQuestState(Q00196_SevenSignsSealOfTheEmperor.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-05.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-05.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java index f80291fa38..34717866a7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java +++ b/trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java @@ -208,7 +208,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest if (npc.getId() == WOOD) { qs = player.getQuestState(Q00197_SevenSignsTheSacredBookOfSeal.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-03.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-03.html"; } break; } @@ -242,7 +242,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest { case 1: { - htmltext = (isBusy) ? "32597-06.html" : "32597-01.html"; + htmltext = isBusy ? "32597-06.html" : "32597-01.html"; break; } case 2: diff --git a/trunk/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/trunk/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java index e00211205b..f04e00dee3 100644 --- a/trunk/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java +++ b/trunk/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java @@ -181,7 +181,7 @@ public class Q00239_WontYouJoinUs extends Quest { case 1: { - htmltext = (hasQuestItems(player, DESTROYED_MACHINE_PIECE)) ? "32643-05.html" : "32643-04.html"; + htmltext = hasQuestItems(player, DESTROYED_MACHINE_PIECE) ? "32643-05.html" : "32643-04.html"; break; } case 2: @@ -195,7 +195,7 @@ public class Q00239_WontYouJoinUs extends Quest } case 3: { - htmltext = (hasQuestItems(player, ENCHANTED_GOLEM_FRAGMENT)) ? "32643-08.html" : "32643-09.html"; + htmltext = hasQuestItems(player, ENCHANTED_GOLEM_FRAGMENT) ? "32643-08.html" : "32643-09.html"; break; } case 4: diff --git a/trunk/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/trunk/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java index e5ba07aae4..4eb42c16c7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java +++ b/trunk/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java @@ -125,7 +125,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest { case 1: { - htmltext = (!hasQuestItems(player, STAKATO_FANG)) ? "32640-8.html" : "32640-9.html"; + htmltext = !hasQuestItems(player, STAKATO_FANG) ? "32640-8.html" : "32640-9.html"; break; } case 2: diff --git a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index a860dc1933..bce85a5573 100644 --- a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -129,37 +129,37 @@ public class Q00254_LegendaryTales extends Quest } case "25718": // Emerald Horn { - htmltext = (checkMask(qs, Bosses.EMERALD_HORN) ? "30754-22.html" : "30754-16.html"); + htmltext = checkMask(qs, Bosses.EMERALD_HORN) ? "30754-22.html" : "30754-16.html"; break; } case "25719": // Dust Rider { - htmltext = (checkMask(qs, Bosses.DUST_RIDER) ? "30754-23.html" : "30754-17.html"); + htmltext = checkMask(qs, Bosses.DUST_RIDER) ? "30754-23.html" : "30754-17.html"; break; } case "25720": // Bleeding Fly { - htmltext = (checkMask(qs, Bosses.BLEEDING_FLY) ? "30754-24.html" : "30754-18.html"); + htmltext = checkMask(qs, Bosses.BLEEDING_FLY) ? "30754-24.html" : "30754-18.html"; break; } case "25721": // Black Dagger Wing { - htmltext = (checkMask(qs, Bosses.BLACK_DAGGER) ? "30754-25.html" : "30754-19.html"); + htmltext = checkMask(qs, Bosses.BLACK_DAGGER) ? "30754-25.html" : "30754-19.html"; break; } case "25722": // Shadow Summoner { - htmltext = (checkMask(qs, Bosses.SHADOW_SUMMONER) ? "30754-26.html" : "30754-16.html"); + htmltext = checkMask(qs, Bosses.SHADOW_SUMMONER) ? "30754-26.html" : "30754-16.html"; break; } case "25723": // Spike Slasher { - htmltext = (checkMask(qs, Bosses.SPIKE_SLASHER) ? "30754-27.html" : "30754-17.html"); + htmltext = checkMask(qs, Bosses.SPIKE_SLASHER) ? "30754-27.html" : "30754-17.html"; break; } case "25724": // Muscle Bomber { - htmltext = (checkMask(qs, Bosses.MUSCLE_BOMBER) ? "30754-28.html" : "30754-18.html"); + htmltext = checkMask(qs, Bosses.MUSCLE_BOMBER) ? "30754-28.html" : "30754-18.html"; break; } case "13467": // Vesper Thrower @@ -208,11 +208,11 @@ public class Q00254_LegendaryTales extends Quest final long count = getQuestItemsCount(player, LARGE_DRAGON_SKULL); if (qs.isCond(1)) { - htmltext = ((count > 0) ? "30754-14.htm" : "30754-06.html"); + htmltext = (count > 0) ? "30754-14.htm" : "30754-06.html"; } else if (qs.isCond(2)) { - htmltext = ((count < 7) ? "30754-12.htm" : "30754-07.html"); + htmltext = (count < 7) ? "30754-12.htm" : "30754-07.html"; } break; } @@ -272,6 +272,6 @@ public class Q00254_LegendaryTales extends Quest private static boolean checkMask(QuestState qs, Bosses boss) { final int pos = boss.getMask(); - return ((qs.getInt("raids") & pos) == pos); + return (qs.getInt("raids") & pos) == pos; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index 8ea8178cad..c2f2e1fdbe 100644 --- a/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/trunk/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -146,7 +146,7 @@ public class Q00278_HomeSecurity extends Quest { case 18905: // Farm Ravager (Crazy) { - final int itemCount = ((getRandom(1000) < 486) ? getRandom(6) + 1 : getRandom(5) + 1); + final int itemCount = (getRandom(1000) < 486) ? getRandom(6) + 1 : getRandom(5) + 1; if (giveItemRandomly(qs.getPlayer(), npc, SEL_MAHUM_MANE, itemCount, SEL_MAHUM_MANE_COUNT, 1.0, true)) { qs.setCond(2, true); diff --git a/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java index 34d81f46b1..2df5c13f9a 100644 --- a/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java +++ b/trunk/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java @@ -135,7 +135,7 @@ public final class Q00279_TargetOfOpportunity extends Quest return htmltext; } - private static final boolean haveAllExceptThis(L2PcInstance player, int idx) + private static boolean haveAllExceptThis(L2PcInstance player, int idx) { for (int i = 0; i < SEAL_COMPONENTS.length; i++) { diff --git a/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 3dd4635d62..70bbdc4010 100644 --- a/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -31,19 +31,19 @@ import com.l2jmobius.gameserver.network.serverpackets.RadarControl; public class Q00307_ControlDeviceOfTheGiants extends Quest { // NPC - private final static int DROPH = 32711; + private static final int DROPH = 32711; // RB - private final static int GORGOLOS = 25681; - private final static int LAST_TITAN_UTENUS = 25684; - private final static int GIANT_MARPANAK = 25680; - private final static int HEKATON_PRIME = 25687; + private static final int GORGOLOS = 25681; + private static final int LAST_TITAN_UTENUS = 25684; + private static final int GIANT_MARPANAK = 25680; + private static final int HEKATON_PRIME = 25687; // Items - private final static int SUPPORT_ITEMS = 14850; - private final static int CET_1_SHEET = 14851; - private final static int CET_2_SHEET = 14852; - private final static int CET_3_SHEET = 14853; + private static final int SUPPORT_ITEMS = 14850; + private static final int CET_1_SHEET = 14851; + private static final int CET_2_SHEET = 14852; + private static final int CET_3_SHEET = 14853; // Misc - private final static int RESPAWN_DELAY = 3600000; // 1 hour + private static final int RESPAWN_DELAY = 3600000; // 1 hour private static L2Npc hekaton; public Q00307_ControlDeviceOfTheGiants() @@ -71,7 +71,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest if (player.getLevel() >= 79) { qs.startQuest(); - htmltext = (hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET)) ? "32711-04a.html" : "32711-04.html"; + htmltext = hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET) ? "32711-04a.html" : "32711-04.html"; } break; } @@ -101,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest return "32711-09.html"; } final String respawn = loadGlobalQuestVar("Respawn"); - final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; + final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0; if (remain > 0) { return "32711-09a.html"; @@ -203,7 +203,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest } else if (qs.isCond(1)) { - htmltext = (!hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET)) ? "32711-07.html" : "32711-08.html"; + htmltext = !hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET) ? "32711-07.html" : "32711-08.html"; } else if (qs.isCond(2)) { diff --git a/trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java index e834f3b7a3..a07d5e800b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java +++ b/trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java @@ -137,9 +137,9 @@ public final class Q00326_VanquishRemnants extends Quest { giveItems(player, BLACK_LION_MARK, 1); } - giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); + giveAdena(player, (red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0), true); takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); - htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; + htmltext = (sum >= 100) ? hasQuestItems(player, BLACK_LION_MARK) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; } else { diff --git a/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 80d7d06483..663d0e2372 100644 --- a/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/trunk/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -1459,7 +1459,7 @@ public final class Q00336_CoinsOfMagic extends Quest { case 42: { - if ((getQuestItemsCount(player, ITEM_1) >= (10 * mul * ITEM_1_MUL))) + if (getQuestItemsCount(player, ITEM_1) >= (10 * mul * ITEM_1_MUL)) { takeItems(player, ITEM_1, 10 * mul * ITEM_1_MUL); giveItems(player, REWARD_1, 1 * mul); diff --git a/trunk/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/trunk/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java index df17bcd80a..4491ce3e24 100644 --- a/trunk/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java +++ b/trunk/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java @@ -252,11 +252,11 @@ public class Q00337_AudienceWithTheLandDragon extends Quest { htmltext = "30753-01.htm"; } - else if ((qs.isCond(1)) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) < 4)) + else if (qs.isCond(1) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) < 4)) { htmltext = "30753-06.html"; } - else if ((qs.isCond(1)) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) >= 4)) + else if (qs.isCond(1) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) >= 4)) { htmltext = "30753-07.html"; } @@ -349,7 +349,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest { if (qs.getInt("drop3") == 1) { - if ((hasQuestItems(player, KRANROT_SKIN)) && (hasQuestItems(player, HAMRUT_LEG))) + if (hasQuestItems(player, KRANROT_SKIN) && hasQuestItems(player, HAMRUT_LEG)) { takeItems(player, KRANROT_SKIN, 1); takeItems(player, HAMRUT_LEG, 1); @@ -380,7 +380,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest { if (qs.getInt("drop4") == 1) { - if ((hasQuestItems(player, MARSH_DRAKE_TALONS)) && (hasQuestItems(player, MARSH_STALKER_HORN))) + if (hasQuestItems(player, MARSH_DRAKE_TALONS) && hasQuestItems(player, MARSH_STALKER_HORN)) { takeItems(player, MARSH_DRAKE_TALONS, 1); takeItems(player, MARSH_STALKER_HORN, 1); @@ -419,7 +419,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case 1: { - if ((hasQuestItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL)) && (hasQuestItems(player, MARA_FANG))) + if (hasQuestItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL) && hasQuestItems(player, MARA_FANG)) { takeItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL, 1); takeItems(player, MARA_FANG, 1); @@ -464,7 +464,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case 1: { - if ((hasQuestItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL)) && (hasQuestItems(player, MUSFEL_FANG))) + if (hasQuestItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL) && hasQuestItems(player, MUSFEL_FANG)) { takeItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL, 1); takeItems(player, MUSFEL_FANG, 1); @@ -497,7 +497,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case GILMORE: { - if ((qs.isCond(2)) || (qs.isCond(1))) + if (qs.isCond(2) || qs.isCond(1)) { htmltext = "30754-01.html"; } @@ -522,7 +522,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case THEODRIC: { - if ((qs.isCond(1)) || (qs.isCond(2))) + if (qs.isCond(1) || qs.isCond(2)) { htmltext = "30755-01.html"; } @@ -580,16 +580,13 @@ public class Q00337_AudienceWithTheLandDragon extends Quest { spawn = jewel3; } + else if (npcId == ABYSSAL_JEWEL_2) + { + spawn = jewel2; + } else { - if (npcId == ABYSSAL_JEWEL_2) - { - spawn = jewel2; - } - else - { - spawn = jewel1; - } + spawn = jewel1; } if (spawn) { @@ -677,7 +674,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case BLOOD_QUEEN: { - if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop1") == 1) && (!hasQuestItems(player, REMAINS_OF_SACRIFIED))) + if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop1") == 1) && !hasQuestItems(player, REMAINS_OF_SACRIFIED)) { for (int i = 0; i < 10; i++) { @@ -688,7 +685,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest } case HARIT_LIZARDMAN_SHAMAN: { - if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop2") == 1) && (!hasQuestItems(player, TOTEM_OF_LAND_DRAGON))) + if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop2") == 1) && !hasQuestItems(player, TOTEM_OF_LAND_DRAGON)) { for (int i = 0; i < 3; i++) { diff --git a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 8771e31823..8caa5ab44d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -425,12 +425,7 @@ public class Q00350_EnhanceYourWeapon extends Quest // Fail if the killer isn't in the _absorbersList of this L2Attackable and mob is not boss final AbsorberInfo ai = mob.getAbsorbersList().get(killer.getObjectId()); - boolean isSuccess = true; - if ((ai == null) || (ai.getObjectId() != killer.getObjectId())) - { - isSuccess = false; - } - + boolean isSuccess = (ai != null) && (ai.getObjectId() == killer.getObjectId()); // Check if the soul crystal was used when HP of this L2Attackable wasn't higher than half of it if ((ai != null) && (ai.getAbsorbedHp() > (mob.getMaxHp() / 2.0))) { @@ -466,8 +461,7 @@ public class Q00350_EnhanceYourWeapon extends Quest { if (killer.getParty() != null) { - final List luckyParty = new ArrayList<>(); - luckyParty.addAll(killer.getParty().getMembers()); + final List luckyParty = new ArrayList<>(killer.getParty().getMembers()); while ((getRandom(100) < 33) && !luckyParty.isEmpty()) { final L2PcInstance lucky = luckyParty.remove(getRandom(luckyParty.size())); diff --git a/trunk/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java b/trunk/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java index f4c30a96c3..299d206cd0 100644 --- a/trunk/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java +++ b/trunk/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java @@ -125,11 +125,11 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest String htmltext = getNoQuestMsg(talker); if (qs.isCreated()) { - htmltext = ((talker.getLevel() < MIN_LVL) ? "30686-01.html" : "30686-02.htm"); + htmltext = (talker.getLevel() < MIN_LVL) ? "30686-01.html" : "30686-02.htm"; } else if (qs.isStarted()) { - htmltext = (hasQuestItems(talker, JADE_CRYSTAL)) ? "30686-07.html" : "30686-06.html"; + htmltext = hasQuestItems(talker, JADE_CRYSTAL) ? "30686-07.html" : "30686-06.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/trunk/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java index 3dfa283797..5903b87ec2 100644 --- a/trunk/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java +++ b/trunk/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java @@ -125,7 +125,7 @@ public final class Q00359_ForASleeplessDeadman extends Quest String htmltext = getNoQuestMsg(player); if (qs.isCreated()) { - htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30857-01.htm" : "30857-06.html"); + htmltext = (player.getLevel() >= MIN_LEVEL) ? "30857-01.htm" : "30857-06.html"; } else if (qs.isStarted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java b/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java index b3aaacbb6a..8ab70fc4c8 100644 --- a/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java +++ b/trunk/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java @@ -217,7 +217,7 @@ public final class Q00371_ShrieksOfGhosts extends Quest { if (npc.getId() == REVA) { - htmltext = (hasQuestItems(player, ANCIENT_PORCELAIN)) ? "30867-04.html" : "30867-10.html"; + htmltext = hasQuestItems(player, ANCIENT_PORCELAIN) ? "30867-04.html" : "30867-10.html"; } else { diff --git a/trunk/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/trunk/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java index 726a4b3338..2c13ffea66 100644 --- a/trunk/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java +++ b/trunk/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java @@ -649,12 +649,8 @@ public final class Q00372_LegacyOfInsolence extends Quest { giveAdena(player, 4000, true); } - htmltext = "30929-02.html"; - } - else - { - htmltext = "30929-02.html"; } + htmltext = "30929-02.html"; break; } case CLAUDIA_ATHEBALDT: diff --git a/trunk/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/trunk/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java index 01c41a10c9..f2ec9277df 100644 --- a/trunk/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java +++ b/trunk/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java @@ -120,11 +120,11 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest if (qs.isCreated()) { - htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html"); + htmltext = (player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html"; } else if (qs.isStarted()) { - htmltext = (hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html"); + htmltext = hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index e008c92e40..49e317b1d6 100644 --- a/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -110,7 +110,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest final int npcId = npc.getId(); if (MOBS1.containsKey(npcId)) { - giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, ((getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2), 0, 1.0, true); + giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, (getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2, 0, 1.0, true); } else { @@ -132,11 +132,11 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest if (qs.isCreated()) { - htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html"); + htmltext = (player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html"; } else if (qs.isStarted()) { - htmltext = (hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html"); + htmltext = hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java b/trunk/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java index d23e5b48a3..9e8bf64766 100644 --- a/trunk/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java +++ b/trunk/dist/game/data/scripts/quests/Q00382_KailsMagicCoin/Q00382_KailsMagicCoin.java @@ -106,7 +106,7 @@ public final class Q00382_KailsMagicCoin extends Quest String htmltext = getNoQuestMsg(talker); if (qs.isCreated()) { - htmltext = (((talker.getLevel() >= MIN_LVL) && hasQuestItems(talker, ROYAL_MEMBERSHIP)) ? "30687-02.htm" : "30687-01.htm"); + htmltext = ((talker.getLevel() >= MIN_LVL) && hasQuestItems(talker, ROYAL_MEMBERSHIP)) ? "30687-02.htm" : "30687-01.htm"; } else if (qs.isStarted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index b9087005ad..0047e660ac 100644 --- a/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -340,7 +340,7 @@ public final class Q00386_StolenDignity extends Quest for (int i0 = 0; i0 < 9; i0 = i0 + 1) { final int i1 = getNumberFromBingoBoard(qs, i0); - html = html.replace("", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff"); + html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); html = html.replace("", i1 + ""); } return html; @@ -353,7 +353,7 @@ public final class Q00386_StolenDignity extends Quest selectBingoNumber(qs, num); final int i3 = getMatchedBingoLineCount(qs); String html; - if ((i3 == 3) && ((getBingoSelectCount(qs)) == 6)) + if ((i3 == 3) && (getBingoSelectCount(qs) == 6)) { reward(player, qs, 4); html = getHtm(player.getHtmlPrefix(), "30843-22.html"); diff --git a/trunk/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/trunk/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index 5822e08ee0..14ba8c7a15 100644 --- a/trunk/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/trunk/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -438,7 +438,7 @@ public final class Q00420_LittleWing extends Quest { if (npc.getId() == COOPER) { - htmltext = ((talker.getLevel() >= MIN_LVL) ? "30829-01.htm" : "30829-03.html"); + htmltext = (talker.getLevel() >= MIN_LVL) ? "30829-01.htm" : "30829-03.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/trunk/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java index 0d962c8307..ecbae53281 100644 --- a/trunk/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java +++ b/trunk/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java @@ -121,7 +121,7 @@ public class Q00431_WeddingMarch extends Quest } case State.STARTED: { - htmltext = (qs.isCond(1)) ? "31042-03.html" : "31042-04.html"; + htmltext = qs.isCond(1) ? "31042-03.html" : "31042-04.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/trunk/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java index dfc9f3cd10..2e50718a9b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java +++ b/trunk/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java @@ -125,7 +125,7 @@ public class Q00432_BirthdayPartySong extends Quest } case State.STARTED: { - htmltext = (qs.isCond(1)) ? "31043-03.html" : "31043-04.html"; + htmltext = qs.isCond(1) ? "31043-03.html" : "31043-04.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/trunk/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 753243448f..a83735a445 100644 --- a/trunk/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/trunk/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -128,7 +128,7 @@ public class Q00450_GraveRobberRescue extends Quest { if (qs.isCond(1)) { - htmltext = (!hasQuestItems(player, EVIDENCE_OF_MIGRATION)) ? "32650-08.html" : "32650-09.html"; + htmltext = !hasQuestItems(player, EVIDENCE_OF_MIGRATION) ? "32650-08.html" : "32650-09.html"; } else { diff --git a/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index edb150be2b..2c36f524e4 100644 --- a/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -67,25 +67,22 @@ public class Q00452_FindingtheLostSoldiers extends Quest qs.startQuest(); } } - else + else if (qs.isCond(1)) { - if (qs.isCond(1)) + if (getRandom(10) < 5) { - if (getRandom(10) < 5) - { - giveItems(player, TAG_ID, 1); - } - else - { - htmltext = "corpse-3.html"; - } - qs.setCond(2, true); - npc.deleteMe(); + giveItems(player, TAG_ID, 1); } else { htmltext = "corpse-3.html"; } + qs.setCond(2, true); + npc.deleteMe(); + } + else + { + htmltext = "corpse-3.html"; } return htmltext; } @@ -134,12 +131,9 @@ public class Q00452_FindingtheLostSoldiers extends Quest break; } } - else + else if (qs.isCond(1)) { - if (qs.isCond(1)) - { - htmltext = "corpse-1.html"; - } + htmltext = "corpse-1.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/trunk/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index ae73c9f1a4..3f20378e4b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/trunk/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -196,7 +196,7 @@ public class Q00455_WingsOfSand extends Quest * Reward the player. * @param qs the quest state of the player to reward */ - private static final void giveItems(QuestState qs) + private static void giveItems(QuestState qs) { final L2PcInstance player = qs.getPlayer(); int chance; diff --git a/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 9305dd14c6..851924c172 100644 --- a/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -203,14 +203,14 @@ public final class Q00456_DontKnowDontCare extends Quest qs.setState(State.CREATED); // intentional fall-through case State.CREATED: - htmltext = ((player.getLevel() >= MIN_LEVEL) ? "32864-01.htm" : "32864-03.html"); + htmltext = (player.getLevel() >= MIN_LEVEL) ? "32864-01.htm" : "32864-03.html"; break; case State.STARTED: switch (qs.getCond()) { case 1: { - htmltext = (hasAtLeastOneQuestItem(player, getRegisteredItemIds()) ? "32864-09.html" : "32864-08.html"); + htmltext = hasAtLeastOneQuestItem(player, getRegisteredItemIds()) ? "32864-09.html" : "32864-08.html"; break; } case 2: diff --git a/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index 5810db4604..065999995a 100644 --- a/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -244,6 +244,6 @@ public final class Q00457_LostAndFound extends Quest private void broadcastNpcSay(L2Npc npc, L2PcInstance player, NpcStringId stringId, boolean whisper) { - ((whisper) ? player : npc).sendPacket(new NpcSay(npc.getObjectId(), ((whisper) ? ChatType.NPC_WHISPER : ChatType.NPC_GENERAL), npc.getId(), stringId)); + (whisper ? player : npc).sendPacket(new NpcSay(npc.getObjectId(), (whisper ? ChatType.NPC_WHISPER : ChatType.NPC_GENERAL), npc.getId(), stringId)); } } \ No newline at end of file diff --git a/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index afd94745b1..e1095e295e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/trunk/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -249,19 +249,16 @@ public class Q00458_PerfectForm extends Quest { qs.set("overhitsCritical", String.valueOf(qs.getInt("overhitsCritical") + 1)); // memoStateEx 2 } - qs.set("overhitsConsecutive", String.valueOf((qs.getInt("overhitsConsecutive") + 1))); // memoStateEx 3 + qs.set("overhitsConsecutive", String.valueOf(qs.getInt("overhitsConsecutive") + 1)); // memoStateEx 3 /* * Retail logic (makes for a long/messy string in database): int i0 = overhitsConsecutive % 100; int i1 = overhitsConsecutive - (i0 * 100); if (i0 < i1) { st.set("overhitsConsecutive", String.valueOf((i1 * 100) + i1)); } */ } - else + // st.set("overhitsConsecutive", String.valueOf((st.getInt("overhitsConsecutive") % 100) * 100)); + else if (qs.getInt("overhitsConsecutive") > 0) { - // st.set("overhitsConsecutive", String.valueOf((st.getInt("overhitsConsecutive") % 100) * 100)); - if (qs.getInt("overhitsConsecutive") > 0) - { - // avoid writing to database if variable is already zero - qs.set("overhitsConsecutive", "0"); - } + // avoid writing to database if variable is already zero + qs.set("overhitsConsecutive", "0"); } if ((qs.getInt("18879") == 10) && (qs.getInt("18886") == 10) && (qs.getInt("18893") == 10) && (qs.getInt("18900") == 10)) diff --git a/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index f518b1af87..253eec4455 100644 --- a/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -239,18 +239,15 @@ public class Q00463_IMustBeaGenius extends Quest { htmltext = "32069-04.html"; } + else if (qs.getInt("var") == 1) + { + htmltext = "32069-06a.html"; + } else { - if (qs.getInt("var") == 1) - { - htmltext = "32069-06a.html"; - } - else - { - takeItems(player, COLLECTION, -1); - qs.set("var", "1"); - htmltext = "32069-06.html"; - } + takeItems(player, COLLECTION, -1); + qs.set("var", "1"); + htmltext = "32069-06.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java b/trunk/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java index 2e298c9ebd..2741f40b8e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java +++ b/trunk/dist/game/data/scripts/quests/Q00470_DivinityProtector/Q00470_DivinityProtector.java @@ -131,7 +131,7 @@ public class Q00470_DivinityProtector extends Quest } case AGRIPEL: { - if ((qs.isCond(2)) && (getQuestItemsCount(player, REMNANT_ASH) >= 20)) + if (qs.isCond(2) && (getQuestItemsCount(player, REMNANT_ASH) >= 20)) { takeItems(player, REMNANT_ASH, 20); giveItems(player, ADENA); diff --git a/trunk/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java b/trunk/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java index 0b385e1e60..1fffc527c5 100644 --- a/trunk/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java +++ b/trunk/dist/game/data/scripts/quests/Q00485_HotSpringWater/Q00485_HotSpringWater.java @@ -121,7 +121,7 @@ public class Q00485_HotSpringWater extends Quest } case WALDERAL: { - if ((qs.isCond(2)) && (getQuestItemsCount(player, HOT_SPRINGS_WATER_SAMPLE) >= 40)) + if (qs.isCond(2) && (getQuestItemsCount(player, HOT_SPRINGS_WATER_SAMPLE) >= 40)) { takeItems(player, HOT_SPRINGS_WATER_SAMPLE, -1); giveItems(player, ADENA); diff --git a/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java b/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java index 585fb10d3c..f3f7fd102d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java +++ b/trunk/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java @@ -568,7 +568,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest { if (lqs != null) { - if ((qs.getMemoState() == 1000)) + if (qs.getMemoState() == 1000) { if (!player.isClanLeader()) { @@ -596,11 +596,11 @@ public final class Q00503_PursuitOfClanAmbition extends Quest htmltext = "30645-05.html"; } } - else if ((qs.getMemoState() == 3000)) + else if (qs.getMemoState() == 3000) { htmltext = "30645-07.html"; } - else if ((qs.getMemoState() > 3000)) + else if (qs.getMemoState() > 3000) { htmltext = "30645-08.html"; } @@ -655,7 +655,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest { if (lqs != null) { - if ((qs.getMemoState() == 4000)) + if (qs.getMemoState() == 4000) { if (!player.isClanLeader()) { @@ -670,7 +670,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest htmltext = "30764-04.html"; } } - else if ((qs.getMemoState() == 5000)) + else if (qs.getMemoState() == 5000) { if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10) { @@ -684,7 +684,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest htmltext = "30764-08a.html"; } } - else if ((qs.getMemoState() >= 6000)) + else if (qs.getMemoState() >= 6000) { htmltext = "30764-09.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 7962f0e0ed..049890c3e3 100644 --- a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -114,9 +114,7 @@ public final class Q00511_AwlUnderFoot extends Quest } } - private static final boolean debug = false; private static final long REENTERTIME = 14400000; - private static final long RAID_SPAWN_DELAY = 120000; private final Map _fortDungeons = new HashMap<>(21); @@ -191,10 +189,6 @@ public final class Q00511_AwlUnderFoot extends Quest private String checkConditions(L2PcInstance player) { - if (debug) - { - return null; - } final L2Party party = player.getParty(); if (party == null) { @@ -346,7 +340,7 @@ public final class Q00511_AwlUnderFoot extends Quest @Override public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon) { - final L2Playable attacker = (isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player); + final L2Playable attacker = isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player; if ((attacker.getLevel() - npc.getLevel()) >= 9) { if ((attacker.getBuffCount() > 0) || (attacker.getDanceCount() > 0)) diff --git a/trunk/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/trunk/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java index 4e589da194..4d6f2f8bd6 100644 --- a/trunk/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java +++ b/trunk/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java @@ -96,7 +96,7 @@ public class Q00553_OlympiadUndefeated extends Quest } final QuestState qs = getQuestState(player, false); - if ((qs != null) && qs.isStarted() && (qs.isCond(1))) + if ((qs != null) && qs.isStarted() && qs.isCond(1)) { final int matches = qs.getInt("undefeatable") + 1; qs.set("undefeatable", String.valueOf(matches)); @@ -140,7 +140,7 @@ public class Q00553_OlympiadUndefeated extends Quest } final QuestState qs = getQuestState(player, false); - if ((qs != null) && qs.isStarted() && (qs.isCond(1))) + if ((qs != null) && qs.isStarted() && qs.isCond(1)) { qs.unset("undefeatable"); takeItems(player, WIN_CONF_2, -1); diff --git a/trunk/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java b/trunk/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java index 9d22eee7f2..e8c8ede8aa 100644 --- a/trunk/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java +++ b/trunk/dist/game/data/scripts/quests/Q00603_DaimonTheWhiteEyedPart1/Q00603_DaimonTheWhiteEyedPart1.java @@ -146,7 +146,7 @@ public final class Q00603_DaimonTheWhiteEyedPart1 extends Quest { if (npc.getId() == EYE_OF_ARGOS) { - htmltext = ((talker.getLevel() < MIN_LVL) ? "31683-02.html" : "31683-01.htm"); + htmltext = (talker.getLevel() < MIN_LVL) ? "31683-02.html" : "31683-01.htm"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/trunk/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java index 90208c46a6..544539ebc9 100644 --- a/trunk/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java @@ -231,36 +231,33 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest } else if (qs.getMemoState() >= 22) { - htmltext = (hasQuestItems(player, ESSENCE_OF_DAIMON)) ? "31683-06.html" : "31683-09.html"; + htmltext = hasQuestItems(player, ESSENCE_OF_DAIMON) ? "31683-06.html" : "31683-09.html"; } } - else + else if (qs.isMemoState(11)) { - if (qs.isMemoState(11)) + if (hasQuestItems(player, SUMMON_CRYSTAL)) { - if (hasQuestItems(player, SUMMON_CRYSTAL)) - { - htmltext = "31541-01.html"; - } + htmltext = "31541-01.html"; } - else if (qs.isMemoState(21)) + } + else if (qs.isMemoState(21)) + { + if (!isDaimonSpawned()) { - if (!isDaimonSpawned()) - { - addSpawn(DAIMON_THE_WHITE_EYED, DAIMON_THE_WHITE_EYED_LOC); - npc.deleteMe(); - htmltext = "31541-02.html"; - } - else - { - htmltext = "31541-03.html"; - } + addSpawn(DAIMON_THE_WHITE_EYED, DAIMON_THE_WHITE_EYED_LOC); + npc.deleteMe(); + htmltext = "31541-02.html"; } - else if (qs.getMemoState() >= 22) + else { - htmltext = "31541-05.html"; + htmltext = "31541-03.html"; } } + else if (qs.getMemoState() >= 22) + { + htmltext = "31541-05.html"; + } } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java b/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java index 8ee445e84d..5ebc4be49e 100644 --- a/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java +++ b/trunk/dist/game/data/scripts/quests/Q00625_TheFinestIngredientsPart2/Q00625_TheFinestIngredientsPart2.java @@ -181,7 +181,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest { if (talker.getLevel() >= MIN_LVL) { - htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm"; + htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm"; } else { diff --git a/trunk/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/trunk/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java index bd58e5bf02..a236d23b28 100644 --- a/trunk/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java +++ b/trunk/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java @@ -133,7 +133,7 @@ public class Q00626_ADarkTwilight extends Quest if (partyMember != null) { final QuestState qs = getQuestState(partyMember, false); - final float chance = (MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP); + final float chance = MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { giveItems(partyMember, BLOOD_OF_SAINT, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/trunk/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 4e9f17901d..2c99822bd9 100644 --- a/trunk/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/trunk/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -184,7 +184,7 @@ public class Q00627_HeartInSearchOfPower extends Quest if (partyMember != null) { final QuestState qs = getQuestState(partyMember, false); - final float chance = (MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP); + final float chance = MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { giveItems(partyMember, BEAD_OF_OBEDIENCE, 1); diff --git a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index 4ef50c0ccf..9dcfa6f7ae 100644 --- a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -135,7 +135,7 @@ public class Q00641_AttackSailren extends Quest } case State.STARTED: { - htmltext = (qs.isCond(1)) ? "32109-1a.html" : "32109-2.html"; + htmltext = qs.isCond(1) ? "32109-1a.html" : "32109-2.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java index 87b429f981..a28768afa9 100644 --- a/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java +++ b/trunk/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java @@ -153,7 +153,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest } else if (qs.isStarted()) { - htmltext = (hasAtLeastOneQuestItem(player, DINOSAUR_TISSUE, DINOSAUR_EGG)) ? "32105-08.html" : "32105-07.html"; + htmltext = hasAtLeastOneQuestItem(player, DINOSAUR_TISSUE, DINOSAUR_EGG) ? "32105-08.html" : "32105-07.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 8bab6bb1cf..d0f453b383 100644 --- a/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -192,7 +192,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest if (Util.contains(MOBS1, npcId)) { - final float chance = (CHANCE_MOBS1 * Config.RATE_QUEST_DROP); + final float chance = CHANCE_MOBS1 * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { rewardItems(partyMember, BONES_OF_A_PLAINS_DINOSAUR, 2); @@ -239,7 +239,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest { if (npc.getId() == SINGSING) { - htmltext = (hasQuestItems(player, BONES_OF_A_PLAINS_DINOSAUR)) ? "32106-08.html" : "32106-14.html"; + htmltext = hasQuestItems(player, BONES_OF_A_PLAINS_DINOSAUR) ? "32106-08.html" : "32106-14.html"; } else if (npc.getId() == KARAKAWEI) { diff --git a/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java index eb8ae47081..879d9df25f 100644 --- a/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java +++ b/trunk/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java @@ -114,7 +114,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest case "ACCEPT": { qs.startQuest(); - if ((q115 != null) && (q115.isCompleted())) + if ((q115 != null) && q115.isCompleted()) { htmltext = "32020-04.htm"; } @@ -200,7 +200,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest { if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") == 0)) { - qs.set("ex", ((getRandom(4) + 1) * 10)); + qs.set("ex", (getRandom(4) + 1) * 10); htmltext = event; } break; @@ -210,7 +210,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") > 0)) { takeItems(player, SILVER_ICE_CRYSTAL, 1); - final int val = (qs.getInt("ex") + 1); + final int val = qs.getInt("ex") + 1; qs.set("ex", val); playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); htmltext = event; @@ -222,7 +222,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") > 0)) { takeItems(player, SILVER_ICE_CRYSTAL, 1); - final int val = (qs.getInt("ex") + 2); + final int val = qs.getInt("ex") + 2; qs.set("ex", val); playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); htmltext = event; @@ -257,7 +257,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest { final int ex = qs.getInt("ex"); final int val1 = ex / 10; - final int val2 = ((ex - (val1 * 10)) + 2); + final int val2 = (ex - (val1 * 10)) + 2; if (val1 == val2) { htmltext = "32023-07.html"; @@ -319,7 +319,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest } else { - htmltext = ((qs2 != null) && (qs2.isCompleted())) ? "32020-02.htm" : "32020-03.htm"; + htmltext = ((qs2 != null) && qs2.isCompleted()) ? "32020-02.htm" : "32020-03.htm"; } } else if (qs.isStarted()) diff --git a/trunk/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/trunk/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java index 11a4f3ad01..919c3a2e1d 100644 --- a/trunk/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java +++ b/trunk/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java @@ -135,16 +135,13 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest htmltext = "35627-04.html"; } } + else if ((clan.getFortId() == ClanHallSiegeEngine.BEAST_FARM) && (minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE)) + { + htmltext = HtmCache.getInstance().getHtm(talker.getHtmlPrefix(), PATH_TO_HTML); + } else { - if ((clan.getFortId() == ClanHallSiegeEngine.BEAST_FARM) && (minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE)) - { - htmltext = HtmCache.getInstance().getHtm(talker.getHtmlPrefix(), PATH_TO_HTML); - } - else - { - htmltext = "35627-05.html"; - } + htmltext = "35627-05.html"; } } else @@ -153,36 +150,27 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest htmltext = htmltext.replace("%next_siege%", getSiegeDate()); } } + else if ((minutesToSiege < 0) || (minutesToSiege > MINUTES_TO_SIEGE)) + { + takeItems(talker, TRAINER_LICENSE, -1); + takeItems(talker, CRYSTAL_OF_PURITY, -1); + qs.exitQuest(true, true); + htmltext = "35627-07.html"; + } + else if (hasQuestItems(talker, TRAINER_LICENSE)) + { + htmltext = "35627-09.html"; + } + else if (getQuestItemsCount(talker, CRYSTAL_OF_PURITY) < REQUIRED_CRYSTAL_COUNT) + { + htmltext = "35627-08.html"; + } else { - if ((minutesToSiege < 0) || (minutesToSiege > MINUTES_TO_SIEGE)) - { - takeItems(talker, TRAINER_LICENSE, -1); - takeItems(talker, CRYSTAL_OF_PURITY, -1); - qs.exitQuest(true, true); - htmltext = "35627-07.html"; - } - else - { - if (hasQuestItems(talker, TRAINER_LICENSE)) - { - htmltext = "35627-09.html"; - } - else - { - if (getQuestItemsCount(talker, CRYSTAL_OF_PURITY) < REQUIRED_CRYSTAL_COUNT) - { - htmltext = "35627-08.html"; - } - else - { - giveItems(talker, TRAINER_LICENSE, 1); - takeItems(talker, CRYSTAL_OF_PURITY, -1); - qs.setCond(3, true); - htmltext = "35627-10.html"; - } - } - } + giveItems(talker, TRAINER_LICENSE, 1); + takeItems(talker, CRYSTAL_OF_PURITY, -1); + qs.setCond(3, true); + htmltext = "35627-10.html"; } return htmltext; } diff --git a/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index 4aa395397d..f02b96c7b6 100644 --- a/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -127,7 +127,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest return super.onKill(npc, player, isSummon); } - final float chance = (DROP_RATE * Config.RATE_QUEST_DROP); + final float chance = DROP_RATE * Config.RATE_QUEST_DROP; if (getRandom(1000) < chance) { rewardItems(partyMember, DINOSAUR_FANG_NECKLACE, 1); @@ -155,7 +155,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest } case State.STARTED: { - htmltext = (hasQuestItems(player, DINOSAUR_FANG_NECKLACE)) ? "32105-05.html" : "32105-12.html"; + htmltext = hasQuestItems(player, DINOSAUR_FANG_NECKLACE) ? "32105-05.html" : "32105-12.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java index 7c1e0107cc..edbb8cff6b 100644 --- a/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java +++ b/trunk/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java @@ -125,13 +125,10 @@ public class Q00699_GuardianOfTheSkies extends Quest giveItems(killer, VULTURES_GOLDEN_FEATHER, amount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } - else + else if (getRandom(1000) < MONSTERS.get(npc.getId())) { - if (getRandom(1000) < MONSTERS.get(npc.getId())) - { - giveItems(killer, VULTURES_GOLDEN_FEATHER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - } + giveItems(killer, VULTURES_GOLDEN_FEATHER, 1); + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); @@ -149,7 +146,7 @@ public class Q00699_GuardianOfTheSkies extends Quest case State.CREATED: { qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); - htmltext = ((qs == null) || (!qs.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; + htmltext = ((qs == null) || !qs.isCompleted() || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; break; } case State.STARTED: @@ -157,7 +154,7 @@ public class Q00699_GuardianOfTheSkies extends Quest final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER); if (feathers > 0) { - giveAdena(player, ((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true); + giveAdena(player, (feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0), true); takeItems(player, VULTURES_GOLDEN_FEATHER, -1); htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java index 3f1f69e5ae..301b6f9651 100644 --- a/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java +++ b/trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java @@ -84,7 +84,7 @@ public class Q00700_CursedLife extends Quest case "32560-02.htm": { qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); - htmltext = ((player.getLevel() < MIN_LVL) || (qs == null) || (!qs.isCompleted())) ? "32560-03.htm" : event; + htmltext = ((player.getLevel() < MIN_LVL) || (qs == null) || !qs.isCompleted()) ? "32560-03.htm" : event; break; } case "32560-04.htm": @@ -132,7 +132,7 @@ public class Q00700_CursedLife extends Quest final long sum = bones + ribs + skulls; if (sum > 0) { - giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); + giveAdena(player, (bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0), true); takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL); htmltext = sum < 10 ? "32560-07.html" : "32560-08.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index f235a699c2..91517a74d4 100644 --- a/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/trunk/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -395,7 +395,7 @@ public class Q00702_ATrapForRevenge extends Quest } case State.STARTED: { - htmltext = (qs.isCond(1)) ? "32563-05.html" : "32563-06.html"; + htmltext = qs.isCond(1) ? "32563-05.html" : "32563-06.html"; break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/trunk/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 49042fbece..8342175117 100644 --- a/trunk/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/trunk/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -71,7 +71,7 @@ public final class Q00902_ReclaimOurEra extends Quest private void giveItem(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && (qs.isStarted()) && (!qs.isCond(5)) && Util.checkIfInRange(1500, npc, player, false)) + if ((qs != null) && qs.isStarted() && !qs.isCond(5) && Util.checkIfInRange(1500, npc, player, false)) { giveItems(player, MONSTER_DROPS.get(npc.getId()), 1); qs.setCond(5, true); diff --git a/trunk/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java b/trunk/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java index 7cf72f6d7c..53d47c2ea3 100644 --- a/trunk/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java +++ b/trunk/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java @@ -92,19 +92,13 @@ public class Q00943_FillingTheEnergyOfDestruction extends Quest } case "33715-06.html": { + takeItems(player, CORE_OF_TWISTED_MAGIC, 1); + giveItems(player, ENERGY_OF_DESTRUCTION, 1); if (player.getLevel() >= 99) { - takeItems(player, CORE_OF_TWISTED_MAGIC, 1); - giveItems(player, ENERGY_OF_DESTRUCTION, 1); addExpAndSp(player, 0, 5371901); - qs.exitQuest(QuestType.DAILY, true); - } - else - { - takeItems(player, CORE_OF_TWISTED_MAGIC, 1); - giveItems(player, ENERGY_OF_DESTRUCTION, 1); - qs.exitQuest(QuestType.DAILY, true); } + qs.exitQuest(QuestType.DAILY, true); break; } } diff --git a/trunk/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/trunk/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index ddb3658203..aa1e48b9ff 100644 --- a/trunk/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/trunk/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -142,13 +142,13 @@ public class Q10274_CollectingInTheAir extends Quest case State.CREATED: { qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); - if (qs == null) + if (qs != null) { - htmltext = "32557-00.html"; + htmltext = ((player.getLevel() >= 75) && qs.isCompleted()) ? "32557-01.htm" : "32557-00.html"; } else { - htmltext = ((player.getLevel() >= 75) && qs.isCompleted()) ? "32557-01.htm" : "32557-00.html"; + htmltext = "32557-00.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java b/trunk/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java index 1d85168869..b523d3fa30 100644 --- a/trunk/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java +++ b/trunk/dist/game/data/scripts/quests/Q10284_AcquisitionOfDivineSword/Q10284_AcquisitionOfDivineSword.java @@ -215,7 +215,7 @@ public final class Q10284_AcquisitionOfDivineSword extends Quest if (npc.getId() == RAFFORTY) { qs = player.getQuestState(Q10283_RequestOfIceMerchant.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.html"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java b/trunk/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java index e2e1052cf6..37aeb7b201 100644 --- a/trunk/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java +++ b/trunk/dist/game/data/scripts/quests/Q10285_MeetingSirra/Q10285_MeetingSirra.java @@ -227,7 +227,7 @@ public final class Q10285_MeetingSirra extends Quest if (npc.getId() == RAFFORTY) { qs = player.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.htm"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java b/trunk/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java index e7caca7b7d..cde2f0c1fb 100644 --- a/trunk/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java +++ b/trunk/dist/game/data/scripts/quests/Q10286_ReunionWithSirra/Q10286_ReunionWithSirra.java @@ -177,7 +177,7 @@ public final class Q10286_ReunionWithSirra extends Quest if (npc.getId() == RAFFORTY) { qs = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.htm"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java b/trunk/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java index d2bcf9f2bc..991473bdb3 100644 --- a/trunk/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java +++ b/trunk/dist/game/data/scripts/quests/Q10287_StoryOfThoseLeft/Q10287_StoryOfThoseLeft.java @@ -161,7 +161,7 @@ public final class Q10287_StoryOfThoseLeft extends Quest if (npc.getId() == RAFFORTY) { qs = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-03.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-03.htm"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index f5084ff754..29f6b3b5e6 100644 --- a/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -215,7 +215,7 @@ public class Q10289_FadeToBlack extends Quest for (L2PcInstance member : party.getMembers()) { // only one lucky player will get the good item, the rest will get the bad one - rewardPlayer(getQuestState(member, false), (idx == rnd)); + rewardPlayer(getQuestState(member, false), idx == rnd); idx++; } } @@ -231,7 +231,7 @@ public class Q10289_FadeToBlack extends Quest @Override public boolean checkPartyMember(QuestState qs, L2Npc npc) { - return (qs.getCond() < 3); + return qs.getCond() < 3; } @Override @@ -276,11 +276,11 @@ public class Q10289_FadeToBlack extends Quest return htmltext; } - private static final void rewardPlayer(QuestState qs, boolean isLucky) + private static void rewardPlayer(QuestState qs, boolean isLucky) { if ((qs != null) && qs.isCond(1)) { - giveItems(qs.getPlayer(), (isLucky ? MARK_OF_SPLENDOR : MARK_OF_DARKNESS), 1); + giveItems(qs.getPlayer(), isLucky ? MARK_OF_SPLENDOR : MARK_OF_DARKNESS, 1); qs.setCond(isLucky ? 3 : 2, true); } } diff --git a/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java index 0be8929bc9..a97cbe71cc 100644 --- a/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java +++ b/trunk/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java @@ -139,7 +139,7 @@ public final class Q10290_LandDragonConqueror extends Quest htmltext = "30755-07.html"; } } - else if ((qs.isCond(2)) && hasQuestItems(player, MIRACLE_NECKLACE)) + else if (qs.isCond(2) && hasQuestItems(player, MIRACLE_NECKLACE)) { htmltext = "30755-08.html"; giveAdena(player, 131236, true); diff --git a/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index b4cc7fac09..c9b1d96a47 100644 --- a/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -240,7 +240,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest else if (qs.isCreated()) { qs = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-03.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-03.htm"; } else if (qs.isStarted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java b/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java index cae0694c79..765b940266 100644 --- a/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java +++ b/trunk/dist/game/data/scripts/quests/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom/Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.java @@ -231,7 +231,7 @@ public final class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends else if (qs.isCreated()) { qs = player.getQuestState(Q10292_SevenSignsGirlOfDoubt.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32784-01.htm" : "32784-11.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32784-01.htm" : "32784-11.htm"; } else if (qs.isStarted()) { diff --git a/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java index 4945126dd2..d25c574937 100644 --- a/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java +++ b/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java @@ -260,22 +260,22 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest } case "DONE1": { - htmltext = ((qs.getInt("good1") == 1) ? "32804-05.html" : "32804-03.html"); + htmltext = (qs.getInt("good1") == 1) ? "32804-05.html" : "32804-03.html"; break; } case "DONE2": { - htmltext = ((qs.getInt("good2") == 1) ? "32805-05.html" : "32805-03.html"); + htmltext = (qs.getInt("good2") == 1) ? "32805-05.html" : "32805-03.html"; break; } case "DONE3": { - htmltext = ((qs.getInt("good3") == 1) ? "32806-05.html" : "32806-03.html"); + htmltext = (qs.getInt("good3") == 1) ? "32806-05.html" : "32806-03.html"; break; } case "DONE4": { - htmltext = ((qs.getInt("good4") == 1) ? "32807-05.html" : "32807-03.html"); + htmltext = (qs.getInt("good4") == 1) ? "32807-05.html" : "32807-03.html"; break; } case "SPAWN_MOBS": @@ -312,7 +312,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest else if (qs.isCreated()) { qs = player.getQuestState(Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32784-01.htm" : "32784-07.htm"; + htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32784-01.htm" : "32784-07.htm"; } else if (qs.isStarted() && qs.isCond(1)) { @@ -336,7 +336,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest } case 3: { - htmltext = ((player.isSubClassActive()) ? "32792-09.html" : "32792-07.html"); + htmltext = player.isSubClassActive() ? "32792-09.html" : "32792-07.html"; break; } } @@ -403,22 +403,22 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest } case READING_DESK1: { - htmltext = ((qs.getInt("good1") == 1) ? "32821-03.html" : "32821-01.html"); + htmltext = (qs.getInt("good1") == 1) ? "32821-03.html" : "32821-01.html"; break; } case READING_DESK5: { - htmltext = ((qs.getInt("good2") == 1) ? "32821-03.html" : "32825-01.html"); + htmltext = (qs.getInt("good2") == 1) ? "32821-03.html" : "32825-01.html"; break; } case READING_DESK9: { - htmltext = ((qs.getInt("good3") == 1) ? "32821-03.html" : "32829-01.html"); + htmltext = (qs.getInt("good3") == 1) ? "32821-03.html" : "32829-01.html"; break; } case READING_DESK13: { - htmltext = ((qs.getInt("good4") == 1) ? "32821-03.html" : "32833-01.html"); + htmltext = (qs.getInt("good4") == 1) ? "32821-03.html" : "32833-01.html"; break; } case SOLINAS_EVIL_THOUGHTS: @@ -440,6 +440,6 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest private boolean hasCheckedAllRightBooks(QuestState qs) { - return ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1)); + return (qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1); } } diff --git a/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java b/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java index afe2ad5374..65fbd55baf 100644 --- a/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java +++ b/trunk/dist/game/data/scripts/quests/Q10296_SevenSignsPowerOfTheSeal/Q10296_SevenSignsPowerOfTheSeal.java @@ -214,7 +214,7 @@ public final class Q10296_SevenSignsPowerOfTheSeal extends Quest { if (qs.isStarted()) { - if ((qs.isCond(2)) && (qs.getInt("boss") == 1)) + if (qs.isCond(2) && (qs.getInt("boss") == 1)) { qs.setCond(3, true); htmltext = "32785-01.html"; diff --git a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java index 9c7ae45ad8..ea0fced455 100644 --- a/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java +++ b/trunk/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java @@ -362,7 +362,7 @@ public class Q10323_TrainLikeItsReal extends Quest final QuestState qs = getQuestState(activeChar, false); final Set npcLogList = new HashSet<>(1); - if ((qs != null) && (qs.isCond(2))) + if ((qs != null) && qs.isCond(2)) { npcLogList.add(new NpcLogListHolder(NpcStringId.ELIMINATE_THE_TRAINING_GOLEM, qs.getMemoState())); return npcLogList; diff --git a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index c8d0fc7485..8c56522229 100644 --- a/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/trunk/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -43,7 +43,7 @@ public class Q10326_RespectYourElders extends Quest // Misc private static final int MAX_LEVEL = 20; private static final Location HANDERMONKEY_SPAWN = new Location(-116617, 255497, -1432); - private final static Location[] HANDERMONKEY_LOC = + private static final Location[] HANDERMONKEY_LOC = { new Location(-116560, 255951, -1457), new Location(-116688, 256597, -1472), diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java index 4dcd189566..b4f0bafec3 100644 --- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java +++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java @@ -53,7 +53,7 @@ public class Q10329_BackupSeekers extends Quest private static final int MAX_LEVEL = 20; private static final Location BART_SPAWN_1 = new Location(-117955, 255832, -1320); private static final Location BART_SPAWN_2 = new Location(-114121, 252445, -1560); - private final static Location[] BART_LOC_1 = + private static final Location[] BART_LOC_1 = { new Location(-117063, 255528, -1296), new Location(-115766, 254791, -1504), @@ -61,7 +61,7 @@ public class Q10329_BackupSeekers extends Quest new Location(-114606, 253534, -1528), new Location(-114375, 252807, -1536), }; - private final static Location[] BART_LOC_2 = + private static final Location[] BART_LOC_2 = { new Location(-114410, 252220, -1591), new Location(-114416, 250812, -1760), diff --git a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index 2a73c32b38..7fa0f6d9db 100644 --- a/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -597,12 +597,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32153-01.htm" : "32153-12.htm"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32153-15.htm"; - } + htmltext = "32153-15.htm"; } break; } @@ -612,12 +609,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32147-01.html" : "32147-11.html"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32147-14.html"; - } + htmltext = "32147-14.html"; } break; } @@ -627,12 +621,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32160-01.html" : "32160-11.html"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32160-14.html"; - } + htmltext = "32160-14.html"; } break; } @@ -642,12 +633,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32150-01.html" : "32150-10.html"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32150-13.html"; - } + htmltext = "32150-13.html"; } break; } @@ -657,12 +645,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32157-01.html" : "32157-08.html"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32157-11.html"; - } + htmltext = "32157-11.html"; } break; } @@ -672,12 +657,9 @@ public class Q10331_StartOfFate extends Quest { htmltext = player.getLevel() >= MIN_LEVEL ? "32146-01.html" : "32146-09.html"; } - else + else if (player.getLevel() >= MIN_LEVEL) { - if (player.getLevel() >= MIN_LEVEL) - { - htmltext = "32146-12.html"; - } + htmltext = "32146-12.html"; } break; } diff --git a/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index f9630b5f65..faea523a21 100644 --- a/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/trunk/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -210,7 +210,7 @@ public class Q10335_RequestToFindSakum extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = qs.getInt(Integer.toString(npc.getId())); if (kills < MOBS_REQUIRED.get(npc.getId())) // check if killed required number of monsters diff --git a/trunk/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java b/trunk/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java index 17912363fb..9297114ac4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java +++ b/trunk/dist/game/data/scripts/quests/Q10336_DividedSakumKanilov/Q10336_DividedSakumKanilov.java @@ -158,7 +158,7 @@ public class Q10336_DividedSakumKanilov extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); // kill counts independent on party/no party - if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { qs.setCond(2); } diff --git a/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java b/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java index 6d307db468..90c39ee646 100644 --- a/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java +++ b/trunk/dist/game/data/scripts/quests/Q10337_SakumsInfluence/Q10337_SakumsInfluence.java @@ -202,7 +202,7 @@ public class Q10337_SakumsInfluence extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = 0; switch (npc.getId()) diff --git a/trunk/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/trunk/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java index 41af2b2d0d..d45a1dd30f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java @@ -312,13 +312,13 @@ public class Q10341_DayOfDestinyHumansFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/trunk/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java index 66052c4410..7848dd84d5 100644 --- a/trunk/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java @@ -284,13 +284,13 @@ public class Q10342_DayOfDestinyElvenFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/trunk/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java index 06c7d50a97..50e673ead8 100644 --- a/trunk/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java @@ -284,13 +284,13 @@ public class Q10343_DayOfDestinyDarkElfsFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/trunk/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java index 1507533f31..dfad0c029f 100644 --- a/trunk/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java @@ -263,13 +263,13 @@ public class Q10344_DayOfDestinyOrcsFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java index 8b321fe86f..ce5a5fc7ce 100644 --- a/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java @@ -249,13 +249,13 @@ public class Q10345_DayOfDestinyDwarfsFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java index 0fddad5860..b214b82cd2 100644 --- a/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java @@ -263,13 +263,13 @@ public class Q10346_DayOfDestinyKamaelsFate extends Quest { if (qs.isCond(2)) { - if (qs.get("" + npc.getId()) == null) + if (qs.get("" + npc.getId()) != null) { - htmltext = "dead_soldier.html"; + htmltext = "dead_collect.html"; } else { - htmltext = "dead_collect.html"; + htmltext = "dead_soldier.html"; } } else if (qs.isCond(3)) diff --git a/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 19ae93840c..0754edc170 100644 --- a/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/trunk/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -178,7 +178,7 @@ public class Q10358_DividedSakumPoslof extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = 0; switch (npc.getId()) diff --git a/trunk/dist/game/data/scripts/quests/Q10359_SakumsTrace/Q10359_SakumsTrace.java b/trunk/dist/game/data/scripts/quests/Q10359_SakumsTrace/Q10359_SakumsTrace.java index 2472f8547b..5f216913a4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10359_SakumsTrace/Q10359_SakumsTrace.java +++ b/trunk/dist/game/data/scripts/quests/Q10359_SakumsTrace/Q10359_SakumsTrace.java @@ -247,7 +247,7 @@ public class Q10359_SakumsTrace extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { if (getQuestItemsCount(qs.getPlayer(), SUSPICIOUS_FRAGMENT) < SUSPICIOUS_FRAGMENT_REQUIRED) { diff --git a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index bbbfa95e4b..38f4f5a5c4 100644 --- a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -808,7 +808,7 @@ public class Q10360_CertificationOfFate extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isStarted() && (qs.getCond() > 1) && (qs.getCond() < 7) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && (qs.getCond() > 1) && (qs.getCond() < 7) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { switch (npc.getId()) { diff --git a/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index 8326383085..1d420b4b6c 100644 --- a/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/trunk/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -165,7 +165,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = 0; switch (npc.getId()) @@ -191,7 +191,7 @@ public class Q10362_CertificationOfTheSeeker extends Quest log.addNpc(STALKER, qs.getInt(Integer.toString(STALKER))); killer.sendPacket(log); - if (((qs.getInt(Integer.toString(CRAWLER)) >= MOBS_REQUIRED.get(CRAWLER)) && (qs.getInt(Integer.toString(STALKER)) >= MOBS_REQUIRED.get(STALKER)))) + if ((qs.getInt(Integer.toString(CRAWLER)) >= MOBS_REQUIRED.get(CRAWLER)) && (qs.getInt(Integer.toString(STALKER)) >= MOBS_REQUIRED.get(STALKER))) { qs.setCond(2); } diff --git a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 9c56474ce2..05237d1182 100644 --- a/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/trunk/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -44,7 +44,7 @@ public final class Q10365_SeekerEscort extends Quest // Locations private static final Location BLOODHOUND_LOC1_SPAWN = new Location(-110579, 238972, -2920); private static final Location BLOODHOUND_LOC2_SPAWN = new Location(-112665, 233944, -3072); - private final static Location[] BLOODHOUND_PATH1_COORDS = + private static final Location[] BLOODHOUND_PATH1_COORDS = { new Location(-110579, 238972, -2920), new Location(-110706, 239273, -2920), @@ -64,7 +64,7 @@ public final class Q10365_SeekerEscort extends Quest new Location(-112022, 240281, -2920), new Location(-112212, 240154, -2920), }; - private final static Location[] BLOODHOUND_PATH2_COORDS = + private static final Location[] BLOODHOUND_PATH2_COORDS = { new Location(-112665, 233944, -3072), new Location(-112431, 233681, -3096), diff --git a/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java index f9f375413f..1fdbcf1d0d 100644 --- a/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java +++ b/trunk/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java @@ -138,7 +138,7 @@ public class Q10368_RebellionOfMonsters extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { if (qs.getInt(Integer.toString(npc.getId())) < MOBS_REQUIRED.get(npc.getId())) { diff --git a/trunk/dist/game/data/scripts/quests/Q10472_WindsOfFate_EncroachingShadows/Q10472_WindsOfFate_EncroachingShadows.java b/trunk/dist/game/data/scripts/quests/Q10472_WindsOfFate_EncroachingShadows/Q10472_WindsOfFate_EncroachingShadows.java index 31755d46fc..601bf65de7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10472_WindsOfFate_EncroachingShadows/Q10472_WindsOfFate_EncroachingShadows.java +++ b/trunk/dist/game/data/scripts/quests/Q10472_WindsOfFate_EncroachingShadows/Q10472_WindsOfFate_EncroachingShadows.java @@ -85,7 +85,7 @@ public class Q10472_WindsOfFate_EncroachingShadows extends Quest private static final int MIN_LEVEL = 85; private static final int RELIQUARY_PRESENTATION_MOVIE_ZONE = 10472; private static final String MOVIE_VAR = "reliquary_of_the_giants_movie_zone"; - private final static int ERTHEIA_AWEK_QUEST_USM_ID = 9; // TODO: Find proper Movie + private static final int ERTHEIA_AWEK_QUEST_USM_ID = 9; // TODO: Find proper Movie public Q10472_WindsOfFate_EncroachingShadows() { diff --git a/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java b/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java index 0ad0d83d27..83368c2f82 100644 --- a/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java +++ b/trunk/dist/game/data/scripts/quests/Q10732_AForeignLand/Q10732_AForeignLand.java @@ -34,7 +34,7 @@ public class Q10732_AForeignLand extends Quest private static final int GERETH = 33932; // Misc private static final int MAX_LEVEL = 20; - private final static int ERTHEIA_FIRST_QUEST_USM_ID = 14; + private static final int ERTHEIA_FIRST_QUEST_USM_ID = 14; public Q10732_AForeignLand() { diff --git a/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java b/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java index b731bf57ef..3994a7d725 100644 --- a/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java +++ b/trunk/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java @@ -41,7 +41,7 @@ public class Q10734_DoOrDie extends Quest // Misc private static final int MAX_LEVEL = 20; // Skills - private final static SkillHolder[] COMMON_BUFFS = + private static final SkillHolder[] COMMON_BUFFS = { new SkillHolder(5182, 1), // Blessing of Protection new SkillHolder(15642, 1), // Horn Melody diff --git a/trunk/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/trunk/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 1ad02dc797..d0e5b7eaef 100644 --- a/trunk/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/trunk/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -307,7 +307,7 @@ public class Q10751_WindsOfFateEncounters extends Quest implements IBypassHandle { htmltext = "33943-01.html"; } - else if (qs.isCond(4) && (!player.getClassId().isMage())) + else if (qs.isCond(4) && !player.getClassId().isMage()) { htmltext = "33943-09.html"; } diff --git a/trunk/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/trunk/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index ce60b17990..afdd1990af 100644 --- a/trunk/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/trunk/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -155,7 +155,7 @@ public class Q10757_QuietingTheStorm extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = 0; switch (npc.getId()) diff --git a/trunk/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java b/trunk/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java index c18d9e4ab5..a1c2dc5c47 100644 --- a/trunk/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java +++ b/trunk/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java @@ -131,7 +131,7 @@ public class Q10764_FreeSpirit extends Quest { case VORBOS: { - if (qs.isCreated() && ((player.getLevel() >= MIN_LEVEL))) + if (qs.isCreated() && (player.getLevel() >= MIN_LEVEL)) { htmltext = "33966-01.htm"; } diff --git a/trunk/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java b/trunk/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java index ee8811b08a..db15213778 100644 --- a/trunk/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java +++ b/trunk/dist/game/data/scripts/quests/Q10766_ANewCraft/Q10766_ANewCraft.java @@ -202,7 +202,7 @@ public class Q10766_ANewCraft extends Quest public void onItemCreate(OnItemCreate event) { final QuestState qs = getQuestState(event.getActiveChar(), false); - if ((qs != null) && (qs.isCond(3)) && (getQuestItemsCount(qs.getPlayer(), AIR_STONE) >= 1) && (getQuestItemsCount(qs.getPlayer(), WINDY_HEALING_POTION_1) >= 1)) + if ((qs != null) && qs.isCond(3) && (getQuestItemsCount(qs.getPlayer(), AIR_STONE) >= 1) && (getQuestItemsCount(qs.getPlayer(), WINDY_HEALING_POTION_1) >= 1)) { qs.setCond(4, true); } diff --git a/trunk/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/trunk/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index d8ff51e358..c9ab11ba13 100644 --- a/trunk/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/trunk/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -158,7 +158,7 @@ public class Q10790_AMercenaryHelper extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { int kills = 0; switch (npc.getId()) diff --git a/trunk/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java b/trunk/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java index 6773e5ae36..41e27ce807 100644 --- a/trunk/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java +++ b/trunk/dist/game/data/scripts/quests/Q10791_TheManOfMystery/Q10791_TheManOfMystery.java @@ -163,7 +163,7 @@ public class Q10791_TheManOfMystery extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); - if ((qs != null) && (qs.getCond() > 0) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false))) + if ((qs != null) && (qs.getCond() > 0) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false)) { switch (npc.getId()) { @@ -190,7 +190,7 @@ public class Q10791_TheManOfMystery extends Quest case NEEDLE_STAKATO_CAPTAIN: { int kills = qs.getInt(Integer.toString(NEEDLE_STAKATO_CAPTAIN)); - if ((kills < 1) && (qs.isCond(2))) + if ((kills < 1) && qs.isCond(2)) { kills++; qs.set(Integer.toString(NEEDLE_STAKATO_CAPTAIN), kills); diff --git a/trunk/dist/game/data/scripts/quests/Q10792_LettersFromTheQueen_ForestOfTheDead/Q10792_LettersFromTheQueen_ForestOfTheDead.java b/trunk/dist/game/data/scripts/quests/Q10792_LettersFromTheQueen_ForestOfTheDead/Q10792_LettersFromTheQueen_ForestOfTheDead.java index 398fbcbc21..dbb18100ff 100644 --- a/trunk/dist/game/data/scripts/quests/Q10792_LettersFromTheQueen_ForestOfTheDead/Q10792_LettersFromTheQueen_ForestOfTheDead.java +++ b/trunk/dist/game/data/scripts/quests/Q10792_LettersFromTheQueen_ForestOfTheDead/Q10792_LettersFromTheQueen_ForestOfTheDead.java @@ -156,7 +156,7 @@ public class Q10792_LettersFromTheQueen_ForestOfTheDead extends Quest implements case HATUBA: { - if ((player.getRace() != Race.ERTHEIA)) + if (player.getRace() != Race.ERTHEIA) { htmltext = getNoQuestMsg(player); } diff --git a/trunk/dist/game/data/scripts/quests/Q10795_LettersFromTheQueen_WallOfAgros/Q10795_LettersFromTheQueen_WallOfAgros.java b/trunk/dist/game/data/scripts/quests/Q10795_LettersFromTheQueen_WallOfAgros/Q10795_LettersFromTheQueen_WallOfAgros.java index 8bc38d0e69..71a963506d 100644 --- a/trunk/dist/game/data/scripts/quests/Q10795_LettersFromTheQueen_WallOfAgros/Q10795_LettersFromTheQueen_WallOfAgros.java +++ b/trunk/dist/game/data/scripts/quests/Q10795_LettersFromTheQueen_WallOfAgros/Q10795_LettersFromTheQueen_WallOfAgros.java @@ -159,7 +159,7 @@ public class Q10795_LettersFromTheQueen_WallOfAgros extends Quest implements IBy case HERMIT: { - if ((player.getRace() != Race.ERTHEIA)) + if (player.getRace() != Race.ERTHEIA) { htmltext = getNoQuestMsg(player); } @@ -233,7 +233,7 @@ public class Q10795_LettersFromTheQueen_WallOfAgros extends Quest implements IBy public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin) { final QuestState qs = getQuestState(player, false); - if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || ((player.getRace() != Race.ERTHEIA))) + if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() != Race.ERTHEIA)) { return false; } diff --git a/trunk/java/com/l2jmobius/Config.java b/trunk/java/com/l2jmobius/Config.java index 8c36f75d0d..c4e45c6841 100644 --- a/trunk/java/com/l2jmobius/Config.java +++ b/trunk/java/com/l2jmobius/Config.java @@ -2888,7 +2888,7 @@ public final class Config { if (geoData.containskey(regionX + "_" + regionY)) { - GEODATA_REGIONS.put((regionX + "_" + regionY), geoData.getBoolean((regionX + "_" + regionY), false)); + GEODATA_REGIONS.put(regionX + "_" + regionY, geoData.getBoolean(regionX + "_" + regionY, false)); } } } diff --git a/trunk/java/com/l2jmobius/commons/geodriver/IBlock.java b/trunk/java/com/l2jmobius/commons/geodriver/IBlock.java index c21b97c07a..93680fdc94 100644 --- a/trunk/java/com/l2jmobius/commons/geodriver/IBlock.java +++ b/trunk/java/com/l2jmobius/commons/geodriver/IBlock.java @@ -21,16 +21,16 @@ package com.l2jmobius.commons.geodriver; */ public interface IBlock { - public static final int TYPE_FLAT = 0; - public static final int TYPE_COMPLEX = 1; - public static final int TYPE_MULTILAYER = 2; + int TYPE_FLAT = 0; + int TYPE_COMPLEX = 1; + int TYPE_MULTILAYER = 2; /** Cells in a block on the x axis */ - public static final int BLOCK_CELLS_X = 8; + int BLOCK_CELLS_X = 8; /** Cells in a block on the y axis */ - public static final int BLOCK_CELLS_Y = 8; + int BLOCK_CELLS_Y = 8; /** Cells in a block */ - public static final int BLOCK_CELLS = BLOCK_CELLS_X * BLOCK_CELLS_Y; + int BLOCK_CELLS = BLOCK_CELLS_X * BLOCK_CELLS_Y; boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe); diff --git a/trunk/java/com/l2jmobius/commons/geodriver/IRegion.java b/trunk/java/com/l2jmobius/commons/geodriver/IRegion.java index dd20debaf0..a17e6a0c5f 100644 --- a/trunk/java/com/l2jmobius/commons/geodriver/IRegion.java +++ b/trunk/java/com/l2jmobius/commons/geodriver/IRegion.java @@ -21,19 +21,19 @@ package com.l2jmobius.commons.geodriver; */ public interface IRegion { - /** Blocks in a region on the x axis */ - public static final int REGION_BLOCKS_X = 256; - /** Blocks in a region on the y axis */ - public static final int REGION_BLOCKS_Y = 256; - /** Blocks in a region */ - public static final int REGION_BLOCKS = REGION_BLOCKS_X * REGION_BLOCKS_Y; + /** Blocks in a region on the x axis. */ + int REGION_BLOCKS_X = 256; + /** Blocks in a region on the y axis. */ + int REGION_BLOCKS_Y = 256; + /** Blocks in a region. */ + int REGION_BLOCKS = REGION_BLOCKS_X * REGION_BLOCKS_Y; - /** Cells in a region on the x axis */ - public static final int REGION_CELLS_X = REGION_BLOCKS_X * IBlock.BLOCK_CELLS_X; - /** Cells in a regioin on the y axis */ - public static final int REGION_CELLS_Y = REGION_BLOCKS_Y * IBlock.BLOCK_CELLS_Y; - /** Cells in a region */ - public static final int REGION_CELLS = REGION_CELLS_X * REGION_CELLS_Y; + /** Cells in a region on the x axis. */ + int REGION_CELLS_X = REGION_BLOCKS_X * IBlock.BLOCK_CELLS_X; + /** Cells in a regioin on the y axis. */ + int REGION_CELLS_Y = REGION_BLOCKS_Y * IBlock.BLOCK_CELLS_Y; + /** Cells in a region. */ + int REGION_CELLS = REGION_CELLS_X * REGION_CELLS_Y; boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe); diff --git a/trunk/java/com/l2jmobius/commons/javaengine/JavaScriptEngine.java b/trunk/java/com/l2jmobius/commons/javaengine/JavaScriptEngine.java index 54ddd09b65..b9e1152b4b 100644 --- a/trunk/java/com/l2jmobius/commons/javaengine/JavaScriptEngine.java +++ b/trunk/java/com/l2jmobius/commons/javaengine/JavaScriptEngine.java @@ -161,7 +161,7 @@ public class JavaScriptEngine extends AbstractScriptEngine implements Compilable } // create a ClassLoader to load classes from MemoryJavaFileManager - return parseMain((new MemoryClassLoader(classBytes, classPath, getParentLoader(ctx))), ctx); + return parseMain(new MemoryClassLoader(classBytes, classPath, getParentLoader(ctx)), ctx); } protected static Class parseMain(MemoryClassLoader loader, ScriptContext ctx) throws ScriptException diff --git a/trunk/java/com/l2jmobius/commons/mmocore/IAcceptFilter.java b/trunk/java/com/l2jmobius/commons/mmocore/IAcceptFilter.java index 59f2aad595..a0e160b7f8 100644 --- a/trunk/java/com/l2jmobius/commons/mmocore/IAcceptFilter.java +++ b/trunk/java/com/l2jmobius/commons/mmocore/IAcceptFilter.java @@ -23,5 +23,5 @@ import java.nio.channels.SocketChannel; */ public interface IAcceptFilter { - public boolean accept(SocketChannel sc); + boolean accept(SocketChannel sc); } diff --git a/trunk/java/com/l2jmobius/commons/mmocore/IClientFactory.java b/trunk/java/com/l2jmobius/commons/mmocore/IClientFactory.java index ab478a2f33..e8a5c4e9fb 100644 --- a/trunk/java/com/l2jmobius/commons/mmocore/IClientFactory.java +++ b/trunk/java/com/l2jmobius/commons/mmocore/IClientFactory.java @@ -22,5 +22,5 @@ package com.l2jmobius.commons.mmocore; */ public interface IClientFactory> { - public T create(MMOConnection con); + T create(MMOConnection con); } diff --git a/trunk/java/com/l2jmobius/commons/mmocore/IMMOExecutor.java b/trunk/java/com/l2jmobius/commons/mmocore/IMMOExecutor.java index 98c811cd3c..539ebce0a2 100644 --- a/trunk/java/com/l2jmobius/commons/mmocore/IMMOExecutor.java +++ b/trunk/java/com/l2jmobius/commons/mmocore/IMMOExecutor.java @@ -22,5 +22,5 @@ package com.l2jmobius.commons.mmocore; */ public interface IMMOExecutor> { - public void execute(ReceivablePacket packet); + void execute(ReceivablePacket packet); } diff --git a/trunk/java/com/l2jmobius/commons/mmocore/IPacketHandler.java b/trunk/java/com/l2jmobius/commons/mmocore/IPacketHandler.java index 2f728268aa..65d2c9435e 100644 --- a/trunk/java/com/l2jmobius/commons/mmocore/IPacketHandler.java +++ b/trunk/java/com/l2jmobius/commons/mmocore/IPacketHandler.java @@ -24,5 +24,5 @@ import java.nio.ByteBuffer; */ public interface IPacketHandler> { - public ReceivablePacket handlePacket(ByteBuffer buf, T client); + ReceivablePacket handlePacket(ByteBuffer buf, T client); } diff --git a/trunk/java/com/l2jmobius/commons/mmocore/SelectorThread.java b/trunk/java/com/l2jmobius/commons/mmocore/SelectorThread.java index 6352623f1c..462cfaac76 100644 --- a/trunk/java/com/l2jmobius/commons/mmocore/SelectorThread.java +++ b/trunk/java/com/l2jmobius/commons/mmocore/SelectorThread.java @@ -106,13 +106,13 @@ public final class SelectorThread>extends Thread final ServerSocket ss = selectable.socket(); - if (address == null) + if (address != null) { - ss.bind(new InetSocketAddress(tcpPort)); + ss.bind(new InetSocketAddress(address, tcpPort)); } else { - ss.bind(new InetSocketAddress(address, tcpPort)); + ss.bind(new InetSocketAddress(tcpPort)); } selectable.register(_selector, SelectionKey.OP_ACCEPT); @@ -289,8 +289,8 @@ public final class SelectorThread>extends Thread { return; } - ByteBuffer buf; - if ((buf = con.getReadBuffer()) == null) + ByteBuffer buf = con.getReadBuffer(); + if (buf == null) { buf = READ_BUFFER; } diff --git a/trunk/java/com/l2jmobius/gameserver/GameTimeController.java b/trunk/java/com/l2jmobius/gameserver/GameTimeController.java index 6ba17bae1d..4db280fa3a 100644 --- a/trunk/java/com/l2jmobius/gameserver/GameTimeController.java +++ b/trunk/java/com/l2jmobius/gameserver/GameTimeController.java @@ -63,7 +63,7 @@ public final class GameTimeController extends Thread super.start(); } - public static final void init() + public static void init() { _instance = new GameTimeController(); } @@ -180,7 +180,7 @@ public final class GameTimeController extends Thread } } - public static final GameTimeController getInstance() + public static GameTimeController getInstance() { return _instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/GeoData.java b/trunk/java/com/l2jmobius/gameserver/GeoData.java index c187f11b2f..c5d8b983ad 100644 --- a/trunk/java/com/l2jmobius/gameserver/GeoData.java +++ b/trunk/java/com/l2jmobius/gameserver/GeoData.java @@ -508,7 +508,7 @@ public class GeoData prevY = curY; prevZ = curZ; } - return (!hasGeoPos(prevX, prevY) || (prevZ == toZ)); + return !hasGeoPos(prevX, prevY) || (prevZ == toZ); } public int traceTerrainZ(int x, int y, int z, int tx, int ty) @@ -574,6 +574,6 @@ public class GeoData private static class SingletonHolder { - protected final static GeoData _instance = new GeoData(); + protected static final GeoData _instance = new GeoData(); } } diff --git a/trunk/java/com/l2jmobius/gameserver/ItemsAutoDestroy.java b/trunk/java/com/l2jmobius/gameserver/ItemsAutoDestroy.java index 9dddef070a..0d2e1048dc 100644 --- a/trunk/java/com/l2jmobius/gameserver/ItemsAutoDestroy.java +++ b/trunk/java/com/l2jmobius/gameserver/ItemsAutoDestroy.java @@ -59,32 +59,9 @@ public final class ItemsAutoDestroy { _items.remove(item.getObjectId()); } - else + else if (item.getItem().getAutoDestroyTime() > 0) { - if (item.getItem().getAutoDestroyTime() > 0) - { - if ((curtime - item.getDropTime()) > item.getItem().getAutoDestroyTime()) - { - L2World.getInstance().removeVisibleObject(item, item.getWorldRegion()); - L2World.getInstance().removeObject(item); - _items.remove(item.getObjectId()); - if (Config.SAVE_DROPPED_ITEM) - { - ItemsOnGroundManager.getInstance().removeObject(item); - } - } - } - else if (item.getItem().hasExImmediateEffect() && ((curtime - item.getDropTime()) > Config.HERB_AUTO_DESTROY_TIME)) - { - L2World.getInstance().removeVisibleObject(item, item.getWorldRegion()); - L2World.getInstance().removeObject(item); - _items.remove(item.getObjectId()); - if (Config.SAVE_DROPPED_ITEM) - { - ItemsOnGroundManager.getInstance().removeObject(item); - } - } - else if ((curtime - item.getDropTime()) > ((Config.AUTODESTROY_ITEM_AFTER == 0) ? 3600000 : Config.AUTODESTROY_ITEM_AFTER * 1000)) + if ((curtime - item.getDropTime()) > item.getItem().getAutoDestroyTime()) { L2World.getInstance().removeVisibleObject(item, item.getWorldRegion()); L2World.getInstance().removeObject(item); @@ -95,6 +72,26 @@ public final class ItemsAutoDestroy } } } + else if (item.getItem().hasExImmediateEffect() && ((curtime - item.getDropTime()) > Config.HERB_AUTO_DESTROY_TIME)) + { + L2World.getInstance().removeVisibleObject(item, item.getWorldRegion()); + L2World.getInstance().removeObject(item); + _items.remove(item.getObjectId()); + if (Config.SAVE_DROPPED_ITEM) + { + ItemsOnGroundManager.getInstance().removeObject(item); + } + } + else if ((curtime - item.getDropTime()) > ((Config.AUTODESTROY_ITEM_AFTER == 0) ? 3600000 : Config.AUTODESTROY_ITEM_AFTER * 1000)) + { + L2World.getInstance().removeVisibleObject(item, item.getWorldRegion()); + L2World.getInstance().removeObject(item); + _items.remove(item.getObjectId()); + if (Config.SAVE_DROPPED_ITEM) + { + ItemsOnGroundManager.getInstance().removeObject(item); + } + } } } diff --git a/trunk/java/com/l2jmobius/gameserver/LoginServerThread.java b/trunk/java/com/l2jmobius/gameserver/LoginServerThread.java index fbc45efb51..2377af8a3d 100644 --- a/trunk/java/com/l2jmobius/gameserver/LoginServerThread.java +++ b/trunk/java/com/l2jmobius/gameserver/LoginServerThread.java @@ -219,7 +219,7 @@ public class LoginServerThread extends Thread try { - publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic((new RSAPublicKeySpec(new BigInteger(init.getRSAKey()), RSAKeyGenParameterSpec.F4))); + publicKey = (RSAPublicKey) KeyFactory.getInstance("RSA").generatePublic(new RSAPublicKeySpec(new BigInteger(init.getRSAKey()), RSAKeyGenParameterSpec.F4)); } catch (GeneralSecurityException e) { diff --git a/trunk/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/trunk/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index f65f51e7e6..66baad3ee2 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -186,13 +186,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } // Check if the target isn't dead, is in the Aggro range and is at the same height - if (target.isAlikeDead() || ((target.isPlayable()) && !me.isInsideRadius(target, me.getAggroRange(), true, false))) + if (target.isAlikeDead() || (target.isPlayable() && !me.isInsideRadius(target, me.getAggroRange(), true, false))) { return false; } // Check if the target is a L2Playable - if (target.isPlayable() && !(me.isRaid()) && !(me.canSeeThroughSilentMove()) && ((L2Playable) target).isSilentMovingAffected()) + if (target.isPlayable() && !me.isRaid() && !me.canSeeThroughSilentMove() && ((L2Playable) target).isSilentMovingAffected()) { return false; } @@ -859,7 +859,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { continue; } - if (!Util.checkIfInRange((healSkill.getCastRange() + collision + leader.getTemplate().getCollisionRadius()), npc, leader, false) && !isParty(healSkill) && !npc.isMovementDisabled()) + if (!Util.checkIfInRange(healSkill.getCastRange() + collision + leader.getTemplate().getCollisionRadius(), npc, leader, false) && !isParty(healSkill) && !npc.isMovementDisabled()) { moveToPawn(leader, healSkill.getCastRange() + collision + leader.getTemplate().getCollisionRadius()); return; @@ -956,7 +956,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { continue; } - if (!Util.checkIfInRange((sk.getCastRange() + collision + leader.getTemplate().getCollisionRadius()), npc, leader, false) && !isParty(sk) && !npc.isMovementDisabled()) + if (!Util.checkIfInRange(sk.getCastRange() + collision + leader.getTemplate().getCollisionRadius(), npc, leader, false) && !isParty(sk) && !npc.isMovementDisabled()) { moveToPawn(leader, sk.getCastRange() + collision + leader.getTemplate().getCollisionRadius()); return; @@ -989,7 +989,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - final L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = (L2Attackable) obj; if (!npc.isInMyClan(targets)) { continue; @@ -1167,34 +1167,31 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable return true; } } - else + else if (GeoData.getInstance().canSeeTarget(caster, attackTarget) && !canAOE(sk) && !attackTarget.isDead() && (dist2 <= srange)) { - if (GeoData.getInstance().canSeeTarget(caster, attackTarget) && !canAOE(sk) && !attackTarget.isDead() && (dist2 <= srange)) - { - if (!attackTarget.isAffectedBySkill(sk.getId())) - { - clientStopMoving(null); - caster.doCast(sk); - return true; - } - } - else if (canAOE(sk)) - { - if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) // - || (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))) - { - clientStopMoving(null); - caster.doCast(sk); - return true; - } - } - else if ((sk.getTargetType() == L2TargetType.ONE) && (effectTargetReconsider(sk, false) != null)) + if (!attackTarget.isAffectedBySkill(sk.getId())) { clientStopMoving(null); caster.doCast(sk); return true; } } + else if (canAOE(sk)) + { + if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB) // + || (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))) + { + clientStopMoving(null); + caster.doCast(sk); + return true; + } + } + else if ((sk.getTargetType() == L2TargetType.ONE) && (effectTargetReconsider(sk, false) != null)) + { + clientStopMoving(null); + caster.doCast(sk); + return true; + } } if (sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT)) @@ -1235,7 +1232,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable final L2Character leader = caster.getLeader(); if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100))) { - if (!Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) + if (!Util.checkIfInRange(sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius(), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) { moveToPawn(leader, sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()); } @@ -1268,7 +1265,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - final L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = (L2Attackable) obj; if (!caster.isInMyClan(targets)) { continue; @@ -1416,7 +1413,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable final L2Character leader = caster.getLeader(); if (leader != null) { - if (leader.isDead() && !Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) + if (leader.isDead() && !Util.checkIfInRange(sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius(), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) { moveToPawn(leader, sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()); } @@ -1438,7 +1435,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - final L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = (L2Attackable) obj; if (!caster.isInMyClan(targets)) { continue; @@ -1462,7 +1459,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable { continue; } - if (caster.isInMyClan(((L2Npc) obj)) && (obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) + if (caster.isInMyClan((L2Npc) obj) && (obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) { clientStopMoving(null); caster.setTarget(caster); @@ -1601,7 +1598,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable } // ------------------------------------------------------------- // Start ATK SKILL when nothing can be done - if ((npc.isMovementDisabled() || (npc.getAiType() == AIType.MAGE) || (npc.getAiType() == AIType.HEALER))) + if (npc.isMovementDisabled() || (npc.getAiType() == AIType.MAGE) || (npc.getAiType() == AIType.HEALER)) { for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.ATTACK)) { @@ -1794,7 +1791,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable continue; } - final L2Attackable targets = ((L2Attackable) obj); + final L2Attackable targets = (L2Attackable) obj; if (targets.isInMyClan(actor)) { continue; diff --git a/trunk/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/trunk/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index d6062334f4..7487e6d61d 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -911,7 +911,7 @@ public class L2CharacterAI extends AbstractAI } // If pathfinding enabled the creature will go to the destination or it will go to the nearest obstacle. - setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, (Config.PATHFINDING > 0 ? GeoData.getInstance().moveCheck(_actor.getX(), _actor.getY(), _actor.getZ(), posX, posY, posZ, _actor.getInstanceId()) : new Location(posX, posY, posZ))); + setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, Config.PATHFINDING > 0 ? GeoData.getInstance().moveCheck(_actor.getX(), _actor.getY(), _actor.getZ(), posX, posY, posZ, _actor.getInstanceId()) : new Location(posX, posY, posZ)); } protected boolean maybeMoveToPosition(ILocational worldPosition, int offset) @@ -1483,46 +1483,43 @@ public class L2CharacterAI extends AbstractAI } } } - else + else if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB)) { - if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB)) + boolean cancast = false; + for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange())) { - boolean cancast = false; - for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange())) + if (!GeoData.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos())) { - if (!GeoData.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos())) - { - continue; - } - if (!target.getEffectList().isEmpty()) - { - cancast = true; - } + continue; } - if (cancast) + if (!target.getEffectList().isEmpty()) { - return true; + cancast = true; } } - else if ((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) + if (cancast) { - boolean cancast = true; - for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange())) + return true; + } + } + else if ((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) + { + boolean cancast = true; + for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange())) + { + if (!GeoData.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos())) { - if (!GeoData.getInstance().canSeeTarget(_actor, target) || ((target instanceof L2Attackable) && !((L2Npc) _actor).isChaos())) - { - continue; - } - if (target.isAffectedBySkill(sk.getId())) - { - cancast = false; - } + continue; } - if (cancast) + if (target.isAffectedBySkill(sk.getId())) { - return true; + cancast = false; } } + if (cancast) + { + return true; + } } return false; } @@ -1539,7 +1536,7 @@ public class L2CharacterAI extends AbstractAI { continue; } - if (((L2Npc) target).isInMyClan(((L2Npc) _actor))) + if (((L2Npc) target).isInMyClan((L2Npc) _actor)) { count++; if (target.isAffectedBySkill(sk.getId())) @@ -1558,6 +1555,6 @@ public class L2CharacterAI extends AbstractAI public boolean isParty(Skill sk) { - return (sk.getTargetType() == L2TargetType.PARTY); + return sk.getTargetType() == L2TargetType.PARTY; } } diff --git a/trunk/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/trunk/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index 7473a9a0f0..f7f2b4bd33 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -129,7 +129,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable L2PcInstance player = null; if (target instanceof L2PcInstance) { - player = ((L2PcInstance) target); + player = (L2PcInstance) target; } else if (target instanceof L2Summon) { @@ -486,16 +486,16 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { final L2Object OldTarget = _actor.getTarget(); - if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) + if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(L2EffectType.HEAL)) { boolean useSkillSelf = true; - if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if (sk.hasEffectType(L2EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { useSkillSelf = false; break; } - if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) + if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { useSkillSelf = false; } @@ -514,7 +514,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable } // Check if the L2SiegeGuardInstance is attacking, knows the target and can't run - if (!(_actor.isAttackingNow()) && (_actor.getRunSpeed() == 0) && (_actor.getKnownList().knowsObject(attackTarget))) + if (!_actor.isAttackingNow() && (_actor.getRunSpeed() == 0) && _actor.getKnownList().knowsObject(attackTarget)) { // Cancel the target _actor.getKnownList().removeKnownObject(attackTarget); @@ -530,30 +530,26 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable final double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance isn't too far from it's home location - if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) && (_actor.getKnownList().knowsObject(attackTarget))) + if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) && _actor.getKnownList().knowsObject(attackTarget)) { // Cancel the target _actor.getKnownList().removeKnownObject(attackTarget); _actor.setTarget(null); setIntention(AI_INTENTION_IDLE, null, null); } - else - // Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast) + // Temporary hack for preventing guards jumping off towers, + // before replacing this with effective geodata checks and AI modification + else if ((dz * dz) < (170 * 170)) { - // Temporary hack for preventing guards jumping off towers, - // before replacing this with effective geodata checks and AI modification - if ((dz * dz) < (170 * 170)) + if (_selfAnalysis.isMage) { - if (_selfAnalysis.isMage) - { - range = _selfAnalysis.maxCastRange - 50; - } - if (_actor.getWalkSpeed() <= 0) - { - return; - } - moveToPawn(attackTarget, attackTarget.isMoving() ? range - 70 : range); + range = _selfAnalysis.maxCastRange - 50; } + if (_actor.getWalkSpeed() <= 0) + { + return; + } + moveToPawn(attackTarget, attackTarget.isMoving() ? range - 70 : range); } } } @@ -603,16 +599,16 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { final L2Object OldTarget = _actor.getTarget(); - if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) + if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(L2EffectType.HEAL)) { boolean useSkillSelf = true; - if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if (sk.hasEffectType(L2EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { useSkillSelf = false; break; } - if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) + if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { useSkillSelf = false; } diff --git a/trunk/java/com/l2jmobius/gameserver/ai/L2PlayableAI.java b/trunk/java/com/l2jmobius/gameserver/ai/L2PlayableAI.java index 64391e0177..e8af628707 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/L2PlayableAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/L2PlayableAI.java @@ -45,7 +45,7 @@ public abstract class L2PlayableAI extends L2CharacterAI { if (target instanceof L2Playable) { - if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getReputation() < 0) && !(target.isInsideZone(ZoneId.PVP))) + if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getReputation() < 0) && !target.isInsideZone(ZoneId.PVP)) { // If attacker have karma and have level >= 10 than his target and target have // Newbie Protection Buff, @@ -54,7 +54,7 @@ public abstract class L2PlayableAI extends L2CharacterAI return; } - if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getReputation() < 0) && !(target.isInsideZone(ZoneId.PVP))) + if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getReputation() < 0) && !target.isInsideZone(ZoneId.PVP)) { // If target have karma and have level >= 10 than his target and actor have // Newbie Protection Buff, diff --git a/trunk/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/trunk/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 8666d4f733..d95fe89369 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -495,16 +495,16 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive()) { final L2Object OldTarget = _actor.getTarget(); - if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) + if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(L2EffectType.HEAL)) { boolean useSkillSelf = true; - if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if (sk.hasEffectType(L2EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { useSkillSelf = false; break; } - if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) + if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { useSkillSelf = false; } @@ -523,7 +523,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable } // Check if the L2SiegeGuardInstance is attacking, knows the target and can't run - if (!(_actor.isAttackingNow()) && (_actor.getRunSpeed() == 0) && (_actor.getKnownList().knowsObject(attackTarget))) + if (!_actor.isAttackingNow() && (_actor.getRunSpeed() == 0) && _actor.getKnownList().knowsObject(attackTarget)) { // Cancel the target _actor.getKnownList().removeKnownObject(attackTarget); @@ -539,31 +539,26 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable final double homeY = attackTarget.getY() - sGuard.getSpawn().getY(); // Check if the L2SiegeGuardInstance isn't too far from it's home location - if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) // 1800 * 1800 - && (_actor.getKnownList().knowsObject(attackTarget))) + if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) && _actor.getKnownList().knowsObject(attackTarget)) { // Cancel the target _actor.getKnownList().removeKnownObject(attackTarget); _actor.setTarget(null); setIntention(AI_INTENTION_IDLE, null, null); } - else - // Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast) + // Temporary hack for preventing guards jumping off towers, + // before replacing this with effective geodata checks and AI modification + else if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct { - // Temporary hack for preventing guards jumping off towers, - // before replacing this with effective geodata checks and AI modification - if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct + if (_selfAnalysis.isHealer) { - if (_selfAnalysis.isHealer) - { - return; - } - if (_selfAnalysis.isMage) - { - range = _selfAnalysis.maxCastRange - 50; - } - moveToPawn(attackTarget, attackTarget.isMoving() ? range - 70 : range); + return; } + if (_selfAnalysis.isMage) + { + range = _selfAnalysis.maxCastRange - 50; + } + moveToPawn(attackTarget, attackTarget.isMoving() ? range - 70 : range); } } } @@ -609,16 +604,16 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !_actor.isSkillDisabled(sk)) { final L2Object OldTarget = _actor.getTarget(); - if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HEAL))) + if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(L2EffectType.HEAL)) { boolean useSkillSelf = true; - if ((sk.hasEffectType(L2EffectType.HEAL)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) + if (sk.hasEffectType(L2EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) { useSkillSelf = false; break; } - if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) + if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId())) { useSkillSelf = false; } diff --git a/trunk/java/com/l2jmobius/gameserver/ai/NextAction.java b/trunk/java/com/l2jmobius/gameserver/ai/NextAction.java index afdc7ffbdf..c88d9bd4d3 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/NextAction.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/NextAction.java @@ -28,7 +28,7 @@ public class NextAction { public interface NextActionCallback { - public void doWork(); + void doWork(); } private List _events; diff --git a/trunk/java/com/l2jmobius/gameserver/ai/npc/FighterAI.java b/trunk/java/com/l2jmobius/gameserver/ai/npc/FighterAI.java index 3c0e4d2b38..bbd20727e2 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/npc/FighterAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/npc/FighterAI.java @@ -111,7 +111,7 @@ public final class FighterAI implements Runnable // Out of combat follow logic. if (!_guard.isInCombat()) { - _guard.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, (new Location((_player.getLocation().getX() + Rnd.get((_followRange * -1), _followRange)), (_player.getLocation().getY() + Rnd.get((_followRange * -1), _followRange)), _player.getLocation().getZ()))); + _guard.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((_player.getLocation().getX() + Rnd.get(_followRange * -1, _followRange)), (_player.getLocation().getY() + Rnd.get(_followRange * -1, _followRange)), _player.getLocation().getZ())); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/ai/npc/HealerAI.java b/trunk/java/com/l2jmobius/gameserver/ai/npc/HealerAI.java index b0be62eec3..443d5b0198 100644 --- a/trunk/java/com/l2jmobius/gameserver/ai/npc/HealerAI.java +++ b/trunk/java/com/l2jmobius/gameserver/ai/npc/HealerAI.java @@ -119,7 +119,7 @@ public final class HealerAI implements Runnable // Out of combat follow logic. if (!_guard.isInCombat()) { - _guard.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, (new Location((_player.getLocation().getX() + Rnd.get((_followRange * -1), _followRange)), (_player.getLocation().getY() + Rnd.get((_followRange * -1), _followRange)), _player.getLocation().getZ()))); + _guard.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location((_player.getLocation().getX() + Rnd.get(_followRange * -1, _followRange)), (_player.getLocation().getY() + Rnd.get(_followRange * -1, _followRange)), _player.getLocation().getZ())); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/cache/HtmCache.java b/trunk/java/com/l2jmobius/gameserver/cache/HtmCache.java index f222c2716a..d965e69ba8 100644 --- a/trunk/java/com/l2jmobius/gameserver/cache/HtmCache.java +++ b/trunk/java/com/l2jmobius/gameserver/cache/HtmCache.java @@ -78,7 +78,7 @@ public class HtmCache public double getMemoryUsage() { - return ((float) _bytesBuffLen / 1048576); + return (float) _bytesBuffLen / 1048576; } public int getLoadedFiles() diff --git a/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java b/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java index 79746aa260..0fc57d3976 100644 --- a/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java +++ b/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/ForumsBBSManager.java @@ -45,7 +45,7 @@ public class ForumsBBSManager extends BaseBBSManager { while (rs.next()) { - addForum((new Forum(rs.getInt("forum_id"), null))); + addForum(new Forum(rs.getInt("forum_id"), null)); } } catch (Exception e) diff --git a/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java b/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java index 7c11e79095..c5114568d1 100644 --- a/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java +++ b/trunk/java/com/l2jmobius/gameserver/communitybbs/Manager/PostBBSManager.java @@ -70,7 +70,7 @@ public class PostBBSManager extends BaseBBSManager final int idp = Integer.parseInt(st.nextToken()); final String index = st.hasMoreTokens() ? st.nextToken() : null; final int ind = index == null ? 1 : Integer.parseInt(index); - showPost((TopicBBSManager.getInstance().getTopicByID(idp)), ForumsBBSManager.getInstance().getForumByID(idf), activeChar, ind); + showPost(TopicBBSManager.getInstance().getTopicByID(idp), ForumsBBSManager.getInstance().getForumByID(idf), activeChar, ind); } else if (command.startsWith("_bbsposts;edit;")) { @@ -80,7 +80,7 @@ public class PostBBSManager extends BaseBBSManager final int idf = Integer.parseInt(st.nextToken()); final int idt = Integer.parseInt(st.nextToken()); final int idp = Integer.parseInt(st.nextToken()); - showEditPost((TopicBBSManager.getInstance().getTopicByID(idt)), ForumsBBSManager.getInstance().getForumByID(idf), activeChar, idp); + showEditPost(TopicBBSManager.getInstance().getTopicByID(idt), ForumsBBSManager.getInstance().getForumByID(idf), activeChar, idp); } else { diff --git a/trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java b/trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java index ad9dfaf244..b33c382c33 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java +++ b/trunk/java/com/l2jmobius/gameserver/data/sql/impl/SummonSkillsTable.java @@ -91,7 +91,7 @@ public class SummonSkillsTable { if (cha.getLevel() < 70) { - lvl = (cha.getLevel() / 10); + lvl = cha.getLevel() / 10; if (lvl <= 0) { lvl = 1; @@ -99,7 +99,7 @@ public class SummonSkillsTable } else { - lvl = (7 + ((cha.getLevel() - 70) / 5)); + lvl = 7 + ((cha.getLevel() - 70) / 5); } // formula usable for skill that have 10 or more skill levels diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java index 90d98c3fdd..2c8becb5e7 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AbilityPointsData.java @@ -91,7 +91,7 @@ public final class AbilityPointsData implements IXmlReader return prevHolder != null ? prevHolder.getSP() : points >= 13 ? 1_000_000_000 : points >= 9 ? 750_000_000 : points >= 5 ? 500_000_000 : 250_000_000; } - public static final AbilityPointsData getInstance() + public static AbilityPointsData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java index b936ffa26b..85caf1be9d 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/AppearanceItemData.java @@ -141,7 +141,7 @@ public class AppearanceItemData implements IXmlReader * Gets the single instance of AppearanceItemData. * @return single instance of AppearanceItemData */ - public static final AppearanceItemData getInstance() + public static AppearanceItemData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java index 0ffde3437a..ec947ceaed 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/BeautyShopData.java @@ -124,7 +124,7 @@ public final class BeautyShopData implements IXmlReader att = attrs.item(i); set.set(att.getNodeName(), att.getNodeValue()); } - beautyData.addFace((new BeautyItem(set))); + beautyData.addFace(new BeautyItem(set)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemBonusData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemBonusData.java index 7001a2ac63..39fd9ed48e 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemBonusData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemBonusData.java @@ -190,7 +190,7 @@ public class EnchantItemBonusData implements IXmlReader * Gets the single instance of EnchantBonusData. * @return single instance of EnchantBonusData */ - public static final EnchantItemBonusData getInstance() + public static EnchantItemBonusData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java index 52f6fa7f36..066432ff9d 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java @@ -153,7 +153,7 @@ public class EnchantItemData implements IXmlReader * Gets the single instance of EnchantItemData. * @return single instance of EnchantItemData */ - public static final EnchantItemData getInstance() + public static EnchantItemData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java index a8c1919e07..ff91a9010d 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemOptionsData.java @@ -112,7 +112,7 @@ public class EnchantItemOptionsData implements IXmlReader * Gets the single instance of EnchantOptionsData. * @return single instance of EnchantOptionsData */ - public static final EnchantItemOptionsData getInstance() + public static EnchantItemOptionsData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystalizationData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystalizationData.java index 70f6c0b673..ca60cb397d 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystalizationData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/ItemCrystalizationData.java @@ -84,7 +84,7 @@ public final class ItemCrystalizationData implements IXmlReader * Gets the single instance of ItemCrystalizationData. * @return single instance of ItemCrystalizationData */ - public static final ItemCrystalizationData getInstance() + public static ItemCrystalizationData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java index 2c08959ed8..6215906173 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java @@ -271,7 +271,7 @@ public final class MultisellData implements IXmlReader separateAndSend(listId, player, npc, inventoryOnly, 1, 1); } - public static final boolean hasSpecialIngredient(int id, long amount, L2PcInstance player) + public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player) { switch (id) { @@ -324,13 +324,13 @@ public final class MultisellData implements IXmlReader return false; } - public static final boolean takeSpecialIngredient(int id, long amount, L2PcInstance player) + public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player) { switch (id) { case PC_BANG_POINTS: // PcBang points { - final int cost = player.getPcBangPoints() - (int) (amount); + final int cost = player.getPcBangPoints() - (int) amount; player.setPcBangPoints(cost); final SystemMessage smsgpc = SystemMessage.getSystemMessage(SystemMessageId.YOU_ARE_USING_S1_POINT); smsgpc.addLong((int) amount); @@ -362,7 +362,7 @@ public final class MultisellData implements IXmlReader return false; } - public static final void giveSpecialProduct(int id, long amount, L2PcInstance player) + public static void giveSpecialProduct(int id, long amount, L2PcInstance player) { switch (id) { diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java index 32c96d6402..2bb160c556 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java @@ -550,54 +550,51 @@ public class NpcData implements IXmlReader aiSkillScopes.add(shortOrLongRangeScope); } } + else if (skill.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT)) + { + aiSkillScopes.add(AISkillScope.NEGATIVE); + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.HEAL)) + { + aiSkillScopes.add(AISkillScope.HEAL); + } + else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN)) + { + aiSkillScopes.add(AISkillScope.ATTACK); + aiSkillScopes.add(AISkillScope.UNIVERSAL); + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.SLEEP)) + { + aiSkillScopes.add(AISkillScope.IMMOBILIZE); + } + else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT)) + { + aiSkillScopes.add(AISkillScope.IMMOBILIZE); + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.MUTE, L2EffectType.FEAR)) + { + aiSkillScopes.add(AISkillScope.COT); + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.PARALYZE)) + { + aiSkillScopes.add(AISkillScope.IMMOBILIZE); + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT)) + { + aiSkillScopes.add(shortOrLongRangeScope); + } + else if (skill.hasEffectType(L2EffectType.RESURRECTION)) + { + aiSkillScopes.add(AISkillScope.RES); + } else { - if (skill.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT)) - { - aiSkillScopes.add(AISkillScope.NEGATIVE); - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.HEAL)) - { - aiSkillScopes.add(AISkillScope.HEAL); - } - else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.PHYSICAL_ATTACK_HP_LINK, L2EffectType.MAGICAL_ATTACK, L2EffectType.DEATH_LINK, L2EffectType.HP_DRAIN)) - { - aiSkillScopes.add(AISkillScope.ATTACK); - aiSkillScopes.add(AISkillScope.UNIVERSAL); - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.SLEEP)) - { - aiSkillScopes.add(AISkillScope.IMMOBILIZE); - } - else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT)) - { - aiSkillScopes.add(AISkillScope.IMMOBILIZE); - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.MUTE, L2EffectType.FEAR)) - { - aiSkillScopes.add(AISkillScope.COT); - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.PARALYZE)) - { - aiSkillScopes.add(AISkillScope.IMMOBILIZE); - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME, L2EffectType.DMG_OVER_TIME_PERCENT)) - { - aiSkillScopes.add(shortOrLongRangeScope); - } - else if (skill.hasEffectType(L2EffectType.RESURRECTION)) - { - aiSkillScopes.add(AISkillScope.RES); - } - else - { - aiSkillScopes.add(AISkillScope.UNIVERSAL); - } + aiSkillScopes.add(AISkillScope.UNIVERSAL); } } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java index 4eb6c1580a..f8863a8413 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/OptionData.java @@ -149,7 +149,7 @@ public class OptionData implements IXmlReader * Gets the single instance of OptionsData. * @return single instance of OptionsData */ - public static final OptionData getInstance() + public static OptionData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java index 70c1abe5f7..3770928b38 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/PlayerTemplateData.java @@ -128,7 +128,7 @@ public final class PlayerTemplateData implements IXmlReader } else if (!cnd.getNodeName().equals("#text")) { - set.set((nd.getNodeName() + cnd.getNodeName()), cnd.getTextContent()); + set.set(nd.getNodeName() + cnd.getNodeName(), cnd.getTextContent()); } } } @@ -138,8 +138,8 @@ public final class PlayerTemplateData implements IXmlReader } } // calculate total pdef and mdef from parts - set.set("basePDef", (set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0))); - set.set("baseMDef", (set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0))); + set.set("basePDef", set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0)); + set.set("baseMDef", set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0)); _playerTemplates.put(ClassId.getClassId(classId), new L2PcTemplate(set, creationPoints)); } @@ -180,7 +180,7 @@ public final class PlayerTemplateData implements IXmlReader return _playerTemplates.get(ClassId.getClassId(classId)); } - public static final PlayerTemplateData getInstance() + public static PlayerTemplateData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java index 37a974fad8..4984f36e64 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java @@ -110,7 +110,7 @@ public class SiegeScheduleData implements IXmlReader return _scheduleData; } - public static final SiegeScheduleData getInstance() + public static SiegeScheduleData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java index 20e5b443e8..fd1f0a0faf 100644 --- a/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java +++ b/trunk/java/com/l2jmobius/gameserver/data/xml/impl/SkillTreesData.java @@ -697,7 +697,7 @@ public final class SkillTreesData implements IXmlReader continue; } - if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId())) + if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId())) { continue; } @@ -750,7 +750,7 @@ public final class SkillTreesData implements IXmlReader continue; } - if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet) && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId())) + if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && includeAutoGet && !player.isGM()) || (!includeAutoGet && skill.isAutoGet()) || (!includeByFs && skill.isLearnedByFS()) || isRemoveSkill(classId, skill.getSkillId())) { continue; } @@ -835,7 +835,7 @@ public final class SkillTreesData implements IXmlReader final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getSkillId()); final int hashCode = SkillData.getSkillHashCode(skill.getSkillId(), maxLvl); - if (skill.isAutoGet() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))) + if (skill.isAutoGet() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())) { final Skill oldSkill = player.getKnownSkill(skill.getSkillId()); if (oldSkill != null) @@ -871,7 +871,7 @@ public final class SkillTreesData implements IXmlReader continue; } - if (skill.isLearnedByNpc() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))) + if (skill.isLearnedByNpc() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())) { final Skill oldSkill = player.getSkills().get(skill.getSkillId()); if (oldSkill != null) @@ -922,7 +922,7 @@ public final class SkillTreesData implements IXmlReader for (L2SkillLearn skill : _alchemySkillTree.values()) { - if (skill.isLearnedByNpc() && ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()))) + if (skill.isLearnedByNpc() && (player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())) { final Skill oldSkill = player.getSkills().get(skill.getSkillId()); @@ -1005,7 +1005,7 @@ public final class SkillTreesData implements IXmlReader final Race race = player.getRace(); for (L2SkillLearn skill : _transformSkillTree.values()) { - if (((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel())) && (skill.getRaces().isEmpty() || skill.getRaces().contains(race))) + if ((player.getLevel() >= skill.getGetLevel()) && (player.getDualClassLevel() >= skill.getDualClassLevel()) && (skill.getRaces().isEmpty() || skill.getRaces().contains(race))) { final Skill oldSkill = player.getSkills().get(skill.getSkillId()); if (oldSkill != null) @@ -1079,7 +1079,7 @@ public final class SkillTreesData implements IXmlReader { for (L2SkillLearn skill : _subPledgeSkillTree.values()) { - if ((clan.getLevel() >= skill.getGetLevel())) + if (clan.getLevel() >= skill.getGetLevel()) { final Skill oldSkill = clan.getSkills().get(skill.getSkillId()); if ((oldSkill == null) || (oldSkill.getLevel() < skill.getSkillLevel())) @@ -1547,7 +1547,7 @@ public final class SkillTreesData implements IXmlReader for (int i = 0; i < classlevel; i++) { classId = classId.getParent(); - if (isCurrentClassSkillNoParent(classId, hashCurrentLevel) && (!isCurrentClassSkillNoParent(player.getClassId(), hashMaxLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashNextLevel)) && !isRemoveSkill(player.getClassId(), skill.getId())) + if (isCurrentClassSkillNoParent(classId, hashCurrentLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashMaxLevel) && !isCurrentClassSkillNoParent(player.getClassId(), hashNextLevel) && !isRemoveSkill(player.getClassId(), skill.getId())) { player.removeSkill(skill, true, true); } diff --git a/trunk/java/com/l2jmobius/gameserver/datatables/AugmentationData.java b/trunk/java/com/l2jmobius/gameserver/datatables/AugmentationData.java index 468c41e27a..f457876260 100644 --- a/trunk/java/com/l2jmobius/gameserver/datatables/AugmentationData.java +++ b/trunk/java/com/l2jmobius/gameserver/datatables/AugmentationData.java @@ -525,10 +525,10 @@ public class AugmentationData int stat34 = 0; if (Config.RETAIL_LIKE_AUGMENTATION) { + final List _selectedChances12 = new ArrayList<>(); + final List _selectedChances34 = new ArrayList<>(); if (item.getItem().isMagicWeapon()) { - final List _selectedChances12 = new ArrayList<>(); - final List _selectedChances34 = new ArrayList<>(); for (AugmentationChance ac : _augmentationChances) { if (ac.getWeaponType().equals("mage") && (ac.getStoneId() == lifeStoneId)) @@ -543,87 +543,9 @@ public class AugmentationData } } } - int r = Rnd.get(10000); - float s = 10000; - for (AugmentationChance ac : _selectedChances12) - { - if (s > r) - { - s -= (ac.getAugmentChance() * 100); - stat12 = ac.getAugmentId(); - } - } - int[] gradeChance = null; - switch (lifeStoneGrade) - { - case AbstractRefinePacket.GRADE_NONE: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_MID: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_MID_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_HIGH: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_HIGH_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_TOP: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_TOP_CHANCE; - break; - } - default: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; - } - } - - int c = Rnd.get(100); - if (c < gradeChance[0]) - { - c = 55; - } - else if (c < (gradeChance[0] + gradeChance[1])) - { - c = 35; - } - else if (c < (gradeChance[0] + gradeChance[1] + gradeChance[2])) - { - c = 7; - } - else - { - c = 3; - } - final List _selectedChances34final = new ArrayList<>(); - for (AugmentationChance ac : _selectedChances34) - { - if (ac.getCategoryChance() == c) - { - _selectedChances34final.add(ac); - } - } - - r = Rnd.get(10000); - s = 10000; - - for (AugmentationChance ac : _selectedChances34final) - { - if (s > r) - { - s -= (ac.getAugmentChance() * 100); - stat34 = ac.getAugmentId(); - } - } } else { - final List _selectedChances12 = new ArrayList<>(); - final List _selectedChances34 = new ArrayList<>(); for (AugmentationChance ac : _augmentationChances) { if (ac.getWeaponType().equals("warrior") && (ac.getStoneId() == lifeStoneId)) @@ -638,79 +560,78 @@ public class AugmentationData } } } - int r = Rnd.get(10000); - float s = 10000; - for (AugmentationChance ac : _selectedChances12) + } + int r = Rnd.get(10000); + float s = 10000; + for (AugmentationChance ac : _selectedChances12) + { + if (s > r) { - if (s > r) - { - s -= (ac.getAugmentChance() * 100); - stat12 = ac.getAugmentId(); - } + s -= ac.getAugmentChance() * 100; + stat12 = ac.getAugmentId(); } - int[] gradeChance = null; - switch (lifeStoneGrade) + } + int[] gradeChance = null; + switch (lifeStoneGrade) + { + case AbstractRefinePacket.GRADE_NONE: { - case AbstractRefinePacket.GRADE_NONE: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_MID: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_MID_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_HIGH: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_HIGH_CHANCE; - break; - } - case AbstractRefinePacket.GRADE_TOP: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_TOP_CHANCE; - break; - } - default: - { - gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; - } + gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; + break; } - - int c = Rnd.get(100); - if (c < gradeChance[0]) + case AbstractRefinePacket.GRADE_MID: { - c = 55; + gradeChance = Config.RETAIL_LIKE_AUGMENTATION_MID_CHANCE; + break; } - else if (c < (gradeChance[0] + gradeChance[1])) + case AbstractRefinePacket.GRADE_HIGH: { - c = 35; + gradeChance = Config.RETAIL_LIKE_AUGMENTATION_HIGH_CHANCE; + break; } - else if (c < (gradeChance[0] + gradeChance[1] + gradeChance[2])) + case AbstractRefinePacket.GRADE_TOP: { - c = 7; + gradeChance = Config.RETAIL_LIKE_AUGMENTATION_TOP_CHANCE; + break; } - else + default: { - c = 3; + gradeChance = Config.RETAIL_LIKE_AUGMENTATION_NG_CHANCE; } - final List _selectedChances34final = new ArrayList<>(); - for (AugmentationChance ac : _selectedChances34) + } + int c = Rnd.get(100); + if (c < gradeChance[0]) + { + c = 55; + } + else if (c < (gradeChance[0] + gradeChance[1])) + { + c = 35; + } + else if (c < (gradeChance[0] + gradeChance[1] + gradeChance[2])) + { + c = 7; + } + else + { + c = 3; + } + final List _selectedChances34final = new ArrayList<>(); + for (AugmentationChance ac : _selectedChances34) + { + if (ac.getCategoryChance() == c) { - if (ac.getCategoryChance() == c) - { - _selectedChances34final.add(ac); - } + _selectedChances34final.add(ac); } - r = Rnd.get(10000); - s = 10000; - for (AugmentationChance ac : _selectedChances34final) + } + r = Rnd.get(10000); + s = 10000; + for (AugmentationChance ac : _selectedChances34final) + { + if (s > r) { - if (s > r) - { - s -= (ac.getAugmentChance() * 100); - stat34 = ac.getAugmentId(); - } + s -= ac.getAugmentChance() * 100; + stat34 = ac.getAugmentId(); } } return new L2Augmentation(((stat34 << 16) + stat12)); @@ -802,20 +723,17 @@ public class AugmentationData resultColor = 0; } } + else if ((resultColor <= ((10 * lifeStoneGrade) + 5)) || (stat34 != 0)) + { + resultColor = 3; + } + else if (resultColor <= ((10 * lifeStoneGrade) + 10)) + { + resultColor = 1; + } else { - if ((resultColor <= ((10 * lifeStoneGrade) + 5)) || (stat34 != 0)) - { - resultColor = 3; - } - else if (resultColor <= ((10 * lifeStoneGrade) + 10)) - { - resultColor = 1; - } - else - { - resultColor = 2; - } + resultColor = 2; } // generate a skill if necessary @@ -866,29 +784,26 @@ public class AugmentationData if (stat34 == 0) { final int temp = Rnd.get(2, 3); - final int colorOffset = (resultColor * (10 * STAT_SUBBLOCKSIZE)) + (temp * STAT_BLOCKSIZE) + 1; + final int colorOffset = (resultColor * 10 * STAT_SUBBLOCKSIZE) + (temp * STAT_BLOCKSIZE) + 1; offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + colorOffset; stat34 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); if (generateGlow && (lifeStoneGrade >= 2)) { - offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (lifeStoneGrade * (10 * STAT_SUBBLOCKSIZE)) + 1; + offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (lifeStoneGrade * 10 * STAT_SUBBLOCKSIZE) + 1; } else { - offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (Rnd.get(0, 1) * (10 * STAT_SUBBLOCKSIZE)) + 1; + offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (Rnd.get(0, 1) * 10 * STAT_SUBBLOCKSIZE) + 1; } } + else if (!generateGlow) + { + offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + 1; + } else { - if (!generateGlow) - { - offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + 1; - } - else - { - offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + (((lifeStoneGrade + resultColor) / 2) * (10 * STAT_SUBBLOCKSIZE)) + 1; - } + offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + (((lifeStoneGrade + resultColor) / 2) * 10 * STAT_SUBBLOCKSIZE) + 1; } stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1); @@ -927,7 +842,7 @@ public class AugmentationData { if (s > r) { - s -= (ac.getAugmentChance() * 100); + s -= ac.getAugmentChance() * 100; stat12 = ac.getAugmentId(); } } @@ -962,7 +877,7 @@ public class AugmentationData { if (s > r) { - s -= (ac.getAugmentChance() * 100); + s -= ac.getAugmentChance() * 100; stat34 = ac.getAugmentId(); } } @@ -1031,7 +946,7 @@ public class AugmentationData return new L2Augmentation(((stat34 << 16) + stat12)); } - public static final AugmentationData getInstance() + public static AugmentationData getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/datatables/BotReportTable.java b/trunk/java/com/l2jmobius/gameserver/datatables/BotReportTable.java index a785dfb0b0..5c4a64ad47 100644 --- a/trunk/java/com/l2jmobius/gameserver/datatables/BotReportTable.java +++ b/trunk/java/com/l2jmobius/gameserver/datatables/BotReportTable.java @@ -288,7 +288,7 @@ public final class BotReportTable return false; } - final long reuse = (System.currentTimeMillis() - rcdRep.getLastReporTime()); + final long reuse = System.currentTimeMillis() - rcdRep.getLastReporTime(); if (reuse < Config.BOTREPORT_REPORT_DELAY) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_MAKE_ANOTHER_REPORT_IN_S1_MINUTE_S_YOU_HAVE_S2_POINT_S_REMAINING_ON_THIS_ACCOUNT); diff --git a/trunk/java/com/l2jmobius/gameserver/datatables/ItemTable.java b/trunk/java/com/l2jmobius/gameserver/datatables/ItemTable.java index 54e3d82d4b..30bc6fa762 100644 --- a/trunk/java/com/l2jmobius/gameserver/datatables/ItemTable.java +++ b/trunk/java/com/l2jmobius/gameserver/datatables/ItemTable.java @@ -260,7 +260,7 @@ public class ItemTable String referenceName = "no-reference"; if (reference instanceof L2Object) { - referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"); + referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"; } else if (reference instanceof String) { @@ -268,7 +268,7 @@ public class ItemTable } if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"), "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", actor.getTarget() != null ? actor.getTarget().getName() : "no-target", "L2Object referencing this action is: " + referenceName); } } @@ -327,7 +327,7 @@ public class ItemTable String referenceName = "no-reference"; if (reference instanceof L2Object) { - referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"); + referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"; } else if (reference instanceof String) { @@ -335,7 +335,7 @@ public class ItemTable } if (Config.GMAUDIT) { - GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", (actor.getTarget() != null ? actor.getTarget().getName() : "no-target"), "L2Object referencing this action is: " + referenceName); + GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", actor.getTarget() != null ? actor.getTarget().getName() : "no-target", "L2Object referencing this action is: " + referenceName); } } diff --git a/trunk/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java b/trunk/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java index bbfe8d4315..09e5e22d36 100644 --- a/trunk/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java +++ b/trunk/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java @@ -103,7 +103,7 @@ public class MerchantPriceConfigTable implements InstanceListManager } } - final MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId); + final MerchantPriceConfig defaultMpc = getMerchantPriceConfig(defaultPriceConfigId); if (defaultMpc == null) { throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig"); diff --git a/trunk/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java b/trunk/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java index 87923f08a8..41115588b7 100644 --- a/trunk/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java +++ b/trunk/java/com/l2jmobius/gameserver/datatables/NpcPersonalAIData.java @@ -104,13 +104,13 @@ public class NpcPersonalAIData { case "disableRandomAnimation": { - npc.setRandomAnimationEnabled((map.get(key) == 0)); + npc.setRandomAnimationEnabled(map.get(key) == 0); break; } case "disableRandomWalk": { - npc.setIsNoRndWalk((map.get(key) == 1)); - spawn.setIsNoRndWalk((map.get(key) == 1)); + npc.setIsNoRndWalk(map.get(key) == 1); + spawn.setIsNoRndWalk(map.get(key) == 1); break; } } diff --git a/trunk/java/com/l2jmobius/gameserver/engines/DocumentBase.java b/trunk/java/com/l2jmobius/gameserver/engines/DocumentBase.java index f179d96bbe..313569c972 100644 --- a/trunk/java/com/l2jmobius/gameserver/engines/DocumentBase.java +++ b/trunk/java/com/l2jmobius/gameserver/engines/DocumentBase.java @@ -342,7 +342,7 @@ public abstract class DocumentBase private StatsSet parseParameters(Node n, Object template) { StatsSet parameters = null; - while ((n != null)) + while (n != null) { // Parse all parameters. if ((n.getNodeType() == Node.ELEMENT_NODE) && "param".equals(n.getNodeName())) diff --git a/trunk/java/com/l2jmobius/gameserver/enums/CategoryType.java b/trunk/java/com/l2jmobius/gameserver/enums/CategoryType.java index 19e6c0d0c3..68e660ab28 100644 --- a/trunk/java/com/l2jmobius/gameserver/enums/CategoryType.java +++ b/trunk/java/com/l2jmobius/gameserver/enums/CategoryType.java @@ -170,7 +170,7 @@ public enum CategoryType * @param categoryName * @return A {@code CategoryType} if category was found, {@code null} if category was not found */ - public static final CategoryType findByName(String categoryName) + public static CategoryType findByName(String categoryName) { for (CategoryType type : values()) { diff --git a/trunk/java/com/l2jmobius/gameserver/enums/IllegalActionPunishmentType.java b/trunk/java/com/l2jmobius/gameserver/enums/IllegalActionPunishmentType.java index bc4b156098..67493f33d7 100644 --- a/trunk/java/com/l2jmobius/gameserver/enums/IllegalActionPunishmentType.java +++ b/trunk/java/com/l2jmobius/gameserver/enums/IllegalActionPunishmentType.java @@ -28,7 +28,7 @@ public enum IllegalActionPunishmentType KICKBAN, JAIL; - public static final IllegalActionPunishmentType findByName(String name) + public static IllegalActionPunishmentType findByName(String name) { for (IllegalActionPunishmentType type : values()) { diff --git a/trunk/java/com/l2jmobius/gameserver/enums/PlayerAction.java b/trunk/java/com/l2jmobius/gameserver/enums/PlayerAction.java index 81879fd203..a4f5f5aa8f 100644 --- a/trunk/java/com/l2jmobius/gameserver/enums/PlayerAction.java +++ b/trunk/java/com/l2jmobius/gameserver/enums/PlayerAction.java @@ -28,7 +28,7 @@ public enum PlayerAction private PlayerAction() { - _mask = (1 << ordinal()); + _mask = 1 << ordinal(); } public int getMask() diff --git a/trunk/java/com/l2jmobius/gameserver/enums/ShotType.java b/trunk/java/com/l2jmobius/gameserver/enums/ShotType.java index c96d8052e1..3227ea06f2 100644 --- a/trunk/java/com/l2jmobius/gameserver/enums/ShotType.java +++ b/trunk/java/com/l2jmobius/gameserver/enums/ShotType.java @@ -30,7 +30,7 @@ public enum ShotType private ShotType() { - _mask = (1 << ordinal()); + _mask = 1 << ordinal(); } public int getMask() diff --git a/trunk/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java index 53ba2e6614..7419fef961 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -52,7 +52,7 @@ public class AdminCommandHandler implements IHandler { - public void registerHandler(K handler); + void registerHandler(K handler); - public void removeHandler(K handler); + void removeHandler(K handler); - public K getHandler(V val); + K getHandler(V val); - public int size(); + int size(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IItemHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IItemHandler.java index 001f5e71ef..2f3d043ad0 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IItemHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IItemHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; */ public interface IItemHandler { - public static final Logger _log = Logger.getLogger(IItemHandler.class.getName()); + Logger _log = Logger.getLogger(IItemHandler.class.getName()); /** * Launch task associated to the item. @@ -35,5 +35,5 @@ public interface IItemHandler * @param forceUse ctrl hold on item use * @return {@code true} if the item all conditions are met and the item is used, {@code false} otherwise. */ - public boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse); + boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IParseBoardHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IParseBoardHandler.java index e19ceb66bc..c92b977415 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IParseBoardHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IParseBoardHandler.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface IParseBoardHandler { - public static final Logger LOG = Logger.getLogger(IParseBoardHandler.class.getName()); + Logger LOG = Logger.getLogger(IParseBoardHandler.class.getName()); /** * Parses a community board command. @@ -34,11 +34,11 @@ public interface IParseBoardHandler * @param player the player * @return */ - public boolean parseCommunityBoardCommand(String command, L2PcInstance player); + boolean parseCommunityBoardCommand(String command, L2PcInstance player); /** * Gets the community board commands. * @return the community board commands */ - public String[] getCommunityBoardCommands(); + String[] getCommunityBoardCommands(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java index e6de81e404..4030ad83de 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IPunishmentHandler.java @@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.punishment.PunishmentType; */ public interface IPunishmentHandler { - static final Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); + Logger _log = Logger.getLogger(IPunishmentHandler.class.getName()); - public void onStart(PunishmentTask task); + void onStart(PunishmentTask task); - public void onEnd(PunishmentTask task); + void onEnd(PunishmentTask task); - public PunishmentType getType(); + PunishmentType getType(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/ITargetTypeHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/ITargetTypeHandler.java index 4bf9358fb8..84623a31b6 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/ITargetTypeHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/ITargetTypeHandler.java @@ -26,9 +26,9 @@ import com.l2jmobius.gameserver.model.skills.targets.L2TargetType; */ public interface ITargetTypeHandler { - static final L2Object[] EMPTY_TARGET_LIST = new L2Object[0]; + L2Object[] EMPTY_TARGET_LIST = new L2Object[0]; - public L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target); + L2Object[] getTargetList(Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target); - public Enum getTargetType(); + Enum getTargetType(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java index d9989554d9..5e4b3e3d5e 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/ITelnetHandler.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; */ public interface ITelnetHandler { - public static Logger _log = Logger.getLogger(ITelnetHandler.class.getName()); + Logger _log = Logger.getLogger(ITelnetHandler.class.getName()); /** * this is the worker method that is called when someone uses an bypass command @@ -35,11 +35,11 @@ public interface ITelnetHandler * @param __uptime * @return success */ - public boolean useCommand(String command, PrintWriter _print, Socket _cSocket, int __uptime); + boolean useCommand(String command, PrintWriter _print, Socket _cSocket, int __uptime); /** * this method is called at initialization to register all bypasses automatically * @return all known bypasses */ - public String[] getCommandList(); + String[] getCommandList(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java index 24d8a0c330..72b8a7b21a 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IUserCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IUserCommandHandler { - public static Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); + Logger _log = Logger.getLogger(IUserCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. @@ -30,11 +30,11 @@ public interface IUserCommandHandler * @param activeChar * @return command success */ - public boolean useUserCommand(int id, L2PcInstance activeChar); + boolean useUserCommand(int id, L2PcInstance activeChar); /** * this method is called at initialization to register all the item ids automatically * @return all known itemIds */ - public int[] getUserCommandList(); + int[] getUserCommandList(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java index 5a61cdd57a..f7c6438246 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IVoicedCommandHandler.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; public interface IVoicedCommandHandler { - public static Logger _log = Logger.getLogger(IVoicedCommandHandler.class.getName()); + Logger _log = Logger.getLogger(IVoicedCommandHandler.class.getName()); /** * this is the worker method that is called when someone uses an admin command. @@ -31,11 +31,11 @@ public interface IVoicedCommandHandler * @param params * @return command success */ - public boolean useVoicedCommand(String command, L2PcInstance activeChar, String params); + boolean useVoicedCommand(String command, L2PcInstance activeChar, String params); /** * this method is called at initialization to register all the item ids automatically * @return all known itemIds */ - public String[] getVoicedCommandList(); + String[] getVoicedCommandList(); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/IWriteBoardHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/IWriteBoardHandler.java index 5cc1b30f55..23ccc9574a 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/IWriteBoardHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/IWriteBoardHandler.java @@ -34,5 +34,5 @@ public interface IWriteBoardHandler extends IParseBoardHandler * @param arg5 the fifth argument * @return */ - public boolean writeCommunityBoardCommand(L2PcInstance player, String arg1, String arg2, String arg3, String arg4, String arg5); + boolean writeCommunityBoardCommand(L2PcInstance player, String arg1, String arg2, String arg3, String arg4, String arg5); } diff --git a/trunk/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/trunk/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java index 6e18cdb4a1..aa65a5beeb 100644 --- a/trunk/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -52,7 +52,7 @@ public class VoicedCommandHandler implements IHandler= Config.ALT_MANOR_REFRESH_MIN) && (min < maintenanceMin))) + else if ((hour == Config.ALT_MANOR_REFRESH_TIME) && (min >= Config.ALT_MANOR_REFRESH_MIN) && (min < maintenanceMin)) { _mode = ManorMode.MAINTENANCE; } @@ -279,7 +279,7 @@ public final class CastleManorManager implements IXmlReader, IStorable } } // Schedule mode change - ThreadPoolManager.getInstance().scheduleGeneral(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis())); + ThreadPoolManager.getInstance().scheduleGeneral(this::changeMode, _nextModeChange.getTimeInMillis() - System.currentTimeMillis()); } public final void changeMode() @@ -552,7 +552,7 @@ public final class CastleManorManager implements IXmlReader, IStorable public final List getSeedProduction(int castleId, boolean nextPeriod) { - return (nextPeriod) ? _productionNext.get(castleId) : _production.get(castleId); + return nextPeriod ? _productionNext.get(castleId) : _production.get(castleId); } public final SeedProduction getSeedProduct(int castleId, int seedId, boolean nextPeriod) @@ -569,7 +569,7 @@ public final class CastleManorManager implements IXmlReader, IStorable public final List getCropProcure(int castleId, boolean nextPeriod) { - return (nextPeriod) ? _procureNext.get(castleId) : _procure.get(castleId); + return nextPeriod ? _procureNext.get(castleId) : _procure.get(castleId); } public final CropProcure getCropProcure(int castleId, int cropId, boolean nextPeriod) @@ -597,7 +597,7 @@ public final class CastleManorManager implements IXmlReader, IStorable } for (CropProcure crop : procure) { - total += (crop.getPrice() * crop.getStartAmount()); + total += crop.getPrice() * crop.getStartAmount(); } return total; } @@ -813,7 +813,7 @@ public final class CastleManorManager implements IXmlReader, IStorable // ------------------------------------------------------- // Static methods // ------------------------------------------------------- - public static final CastleManorManager getInstance() + public static CastleManorManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 7e5e6a2646..a185eb09c4 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -365,7 +365,7 @@ public class ClanEntryManager sortBy = Util.constrain(sortBy, 1, CLAN_COMPARATOR.size() - 1); //@formatter:off return _clanList.values().stream() - .filter((p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != p.getClanLevel())) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != p.getClanLevel()) || (karma != p.getKarma())))))) + .filter(p -> (((clanLevel < 0) && (karma >= 0) && (karma != p.getKarma())) || ((clanLevel >= 0) && (karma < 0) && (clanLevel != p.getClanLevel())) || ((clanLevel >= 0) && (karma >= 0) && ((clanLevel != p.getClanLevel()) || (karma != p.getKarma()))))) .sorted(descending ? CLAN_COMPARATOR.get(sortBy).reversed() : CLAN_COMPARATOR.get(sortBy)) .collect(Collectors.toList()); //@formatter:on diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java index a47ea17324..4ef73c17a6 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java @@ -172,7 +172,7 @@ public final class ClanHallAuctionManager } } - public static final ClanHallAuctionManager getInstance() + public static ClanHallAuctionManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java index 7db6417ddd..9f82bd36ae 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ClanHallManager.java @@ -109,7 +109,7 @@ public final class ClanHallManager } } - public static final Map getAllClanHalls() + public static Map getAllClanHalls() { return _allClanHalls; } @@ -138,7 +138,7 @@ public final class ClanHallManager return _allAuctionableClanHalls; } - public static final void addClanHall(ClanHall hall) + public static void addClanHall(ClanHall hall) { _allClanHalls.put(hall.getId(), hall); } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java index a32beecc6f..e43710408d 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/CommissionManager.java @@ -236,7 +236,7 @@ public final class CommissionManager return; } - final long registrationFee = (long) Math.max(MIN_REGISTRATION_AND_SALE_FEE, (totalPrice * REGISTRATION_FEE_PER_DAY) * durationInDays); + final long registrationFee = (long) Math.max(MIN_REGISTRATION_AND_SALE_FEE, totalPrice * REGISTRATION_FEE_PER_DAY * durationInDays); if (!player.getInventory().reduceAdena("Commission Registration Fee", registrationFee, player, null)) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ADENA_TO_REGISTER_THE_ITEM); @@ -382,7 +382,7 @@ public final class CommissionManager if (deleteItemFromDB(commissionId)) { - final long saleFee = (long) Math.max(MIN_REGISTRATION_AND_SALE_FEE, (totalPrice * SALE_FEE_PER_DAY) * commissionItem.getDurationInDays()); + final long saleFee = (long) Math.max(MIN_REGISTRATION_AND_SALE_FEE, totalPrice * SALE_FEE_PER_DAY * commissionItem.getDurationInDays()); final Message mail = new Message(itemInstance.getOwnerId(), itemInstance, MailType.COMMISSION_ITEM_SOLD); final Mail attachement = mail.createAttachments(); diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java index 59a75a73c7..73d6181a75 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/CoupleManager.java @@ -136,7 +136,7 @@ public final class CoupleManager return _couples; } - public static final CoupleManager getInstance() + public static CoupleManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java index 745482c3e5..2e8d72fa94 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/CursedWeaponsManager.java @@ -412,7 +412,7 @@ public final class CursedWeaponsManager } } - public static final CursedWeaponsManager getInstance() + public static CursedWeaponsManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java index b16760874f..cbab8fb843 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java @@ -88,14 +88,11 @@ public final class DuelManager return; } } - else + else if ((playerA.getPvpFlag() != 0) || (playerB.getPvpFlag() != 0)) { - if ((playerA.getPvpFlag() != 0) || (playerB.getPvpFlag() != 0)) - { - playerA.sendMessage(engagedInPvP); - playerB.sendMessage(engagedInPvP); - return; - } + playerA.sendMessage(engagedInPvP); + playerB.sendMessage(engagedInPvP); + return; } final int duelId = _currentDuelId.incrementAndGet(); _duels.put(duelId, new Duel(playerA, playerB, partyDuel, duelId)); @@ -195,7 +192,7 @@ public final class DuelManager { reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_POLYMORPHED; } - else if (target.isDead() || target.isAlikeDead() || ((target.getCurrentHp() < (target.getMaxHp() / 2)) || (target.getCurrentMp() < (target.getMaxMp() / 2)))) + else if (target.isDead() || target.isAlikeDead() || (target.getCurrentHp() < (target.getMaxHp() / 2)) || (target.getCurrentMp() < (target.getMaxMp() / 2))) { reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_S_HP_OR_MP_IS_BELOW_50; } @@ -239,7 +236,7 @@ public final class DuelManager return true; } - public static final DuelManager getInstance() + public static DuelManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/EventShrineManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/EventShrineManager.java index 176a67d847..2891bba023 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/EventShrineManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/EventShrineManager.java @@ -33,7 +33,7 @@ public final class EventShrineManager ENABLE_SHRINES = enabled; } - public static final EventShrineManager getInstance() + public static EventShrineManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/FortManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/FortManager.java index 23fad8dffd..41db13a24a 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/FortManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/FortManager.java @@ -195,7 +195,7 @@ public final class FortManager implements InstanceListManager } } - public static final FortManager getInstance() + public static FortManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index d619885af3..8b6f22e6ab 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -260,7 +260,7 @@ public final class FortSiegeManager public boolean isCombat(int itemId) { - return (itemId == 9819); + return itemId == 9819; } public boolean activateCombatFlag(L2PcInstance player, L2ItemInstance item) @@ -321,7 +321,7 @@ public final class FortSiegeManager } } - public static final FortSiegeManager getInstance() + public static FortSiegeManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java index 3f32c6a295..e400a150cf 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/FourSepulchersManager.java @@ -1537,7 +1537,7 @@ public final class FourSepulchersManager { continue; } - ((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout((min == 90 ? NpcStringId.GAME_OVER_THE_TELEPORT_WILL_APPEAR_MOMENTARILY : NpcStringId.MINUTE_S_HAVE_PASSED)); + ((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(min == 90 ? NpcStringId.GAME_OVER_THE_TELEPORT_WILL_APPEAR_MOMENTARILY : NpcStringId.MINUTE_S_HAVE_PASSED); } } else if (_inEntryTime) @@ -1571,7 +1571,7 @@ public final class FourSepulchersManager player.sendPacket(html); } - public static final FourSepulchersManager getInstance() + public static FourSepulchersManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java index ffb59ed8e3..a5198a3201 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/GlobalVariablesManager.java @@ -130,7 +130,7 @@ public final class GlobalVariablesManager extends AbstractVariables * Gets the single instance of {@code GlobalVariablesManager}. * @return single instance of {@code GlobalVariablesManager} */ - public static final GlobalVariablesManager getInstance() + public static GlobalVariablesManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java index d9df224112..c2cda1a3ad 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/GraciaSeedsManager.java @@ -132,13 +132,13 @@ public final class GraciaSeedsManager public void updateSodState() { final Quest quest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); - if (quest == null) + if (quest != null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + quest.notifyEvent("StopSoDAi", null, null); } else { - quest.notifyEvent("StopSoDAi", null, null); + _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } } @@ -155,13 +155,13 @@ public final class GraciaSeedsManager } saveData(SODTYPE); final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS); - if (esQuest == null) + if (esQuest != null) { - _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); + esQuest.notifyEvent("StartSoDAi", null, null); } else { - esQuest.notifyEvent("StartSoDAi", null, null); + _log.warning(getClass().getSimpleName() + ": missing EnergySeeds Quest!"); } } @@ -199,7 +199,7 @@ public final class GraciaSeedsManager } case 2: { - return ((_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis()); + return (_SoDLastStateChangeDate.getTimeInMillis() + Config.SOD_STAGE_2_LENGTH) - System.currentTimeMillis(); } case 3: { @@ -228,7 +228,7 @@ public final class GraciaSeedsManager * Gets the single instance of {@code GraciaSeedsManager}. * @return single instance of {@code GraciaSeedsManager} */ - public static final GraciaSeedsManager getInstance() + public static GraciaSeedsManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java index 65258fad50..5a63610562 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java @@ -204,7 +204,7 @@ public final class InstanceManager implements IXmlReader { return _instanceIdNames.get(id); } - return ("UnknownInstance"); + return "UnknownInstance"; } @Override @@ -253,7 +253,7 @@ public final class InstanceManager implements IXmlReader { for (InstanceWorld temp : _instanceWorlds.values()) { - if ((temp != null) && (temp.isAllowed(player.getObjectId()))) + if ((temp != null) && temp.isAllowed(player.getObjectId())) { return temp; } @@ -384,7 +384,7 @@ public final class InstanceManager implements IXmlReader * Gets the single instance of {@code InstanceManager}. * @return single instance of {@code InstanceManager} */ - public static final InstanceManager getInstance() + public static InstanceManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java index 6b96f9a4cf..23fdce7350 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemAuctionManager.java @@ -102,7 +102,7 @@ public final class ItemAuctionManager throw new Exception("Dublicated instanceId " + instanceId); } - _managerInstances.put(instanceId, (new ItemAuctionInstance(instanceId, _auctionIds, nb))); + _managerInstances.put(instanceId, new ItemAuctionInstance(instanceId, _auctionIds, nb)); } } } @@ -133,7 +133,7 @@ public final class ItemAuctionManager return _auctionIds.getAndIncrement(); } - public static final void deleteAuction(int auctionId) + public static void deleteAuction(int auctionId) { try (Connection con = DatabaseFactory.getInstance().getConnection()) { @@ -159,7 +159,7 @@ public final class ItemAuctionManager * Gets the single instance of {@code ItemAuctionManager}. * @return single instance of {@code ItemAuctionManager} */ - public static final ItemAuctionManager getInstance() + public static ItemAuctionManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index e818416bea..df74c9600a 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java @@ -218,8 +218,8 @@ public final class ItemsOnGroundManager implements Runnable ps.setInt(5, item.getX()); ps.setInt(6, item.getY()); ps.setInt(7, item.getZ()); - ps.setLong(8, (item.isProtected() ? -1 : item.getDropTime())); // item is protected or AutoDestroyed - ps.setLong(9, (item.isEquipable() ? 1 : 0)); // set equip-able + ps.setLong(8, item.isProtected() ? -1 : item.getDropTime()); // item is protected or AutoDestroyed + ps.setLong(9, item.isEquipable() ? 1 : 0); // set equip-able ps.execute(); ps.clearParameters(); } @@ -239,7 +239,7 @@ public final class ItemsOnGroundManager implements Runnable * Gets the single instance of {@code ItemsOnGroundManager}. * @return single instance of {@code ItemsOnGroundManager} */ - public static final ItemsOnGroundManager getInstance() + public static ItemsOnGroundManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/JumpManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/JumpManager.java index 3bc98edec8..2859a0a578 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/JumpManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/JumpManager.java @@ -200,7 +200,7 @@ public class JumpManager return; } final Track t = getTrack(player.getJumpTrackId()); - if (!((t.x == 0) && (t.y == 0) && (t.z == 0))) + if ((t.x != 0) || (t.y != 0) || (t.z != 0)) { player.broadcastPacket(new FlyToLocation(player, t.x, t.y, t.z, FlyType.DUMMY)); player.setXYZ(t.x, t.y, t.z); @@ -226,7 +226,7 @@ public class JumpManager player.setXYZ(n.getX(), n.getY(), n.getZ()); } - public static final JumpManager getInstance() + public static JumpManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java index 115a6ee4b1..08ac50236e 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/MapRegionManager.java @@ -258,7 +258,7 @@ public final class MapRegionManager implements IXmlReader if (castle == null) { castle = CastleManager.getInstance().getCastle(player); - if (!((castle != null) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null))) + if ((castle == null) || !castle.getSiege().isInProgress() || (castle.getSiege().getDefenderClan(player.getClan()) == null)) { castle = null; } @@ -279,7 +279,7 @@ public final class MapRegionManager implements IXmlReader if (fort == null) { fort = FortManager.getInstance().getFort(player); - if (!((fort != null) && fort.getSiege().isInProgress() && (fort.getOwnerClan() == player.getClan()))) + if ((fort == null) || !fort.getSiege().isInProgress() || (fort.getOwnerClan() != player.getClan())) { fort = null; } @@ -406,7 +406,7 @@ public final class MapRegionManager implements IXmlReader { try { - final L2PcInstance player = ((L2PcInstance) activeChar); + final L2PcInstance player = (L2PcInstance) activeChar; final L2MapRegion region = _regions.get(point); if (region.getBannedRace().containsKey(player.getRace())) diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java index 0462bb9484..c146ff1e22 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java @@ -121,7 +121,7 @@ public final class MercTicketManager for (int i2 = 0; i2 < 50; i2 += 10) { // Simplified if statement; - if (((itemId >= ITEM_IDS[i2 + (i * GUARDIAN_TYPES_COUNT)]) && (itemId <= ITEM_IDS[i2 + 9 + (i * GUARDIAN_TYPES_COUNT)]))) + if ((itemId >= ITEM_IDS[i2 + (i * GUARDIAN_TYPES_COUNT)]) && (itemId <= ITEM_IDS[i2 + 9 + (i * GUARDIAN_TYPES_COUNT)])) { return i + 1; } @@ -182,7 +182,7 @@ public final 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().isInProgress())) + if ((castle != null) && !castle.getSiege().isInProgress()) { itemId = ITEM_IDS[i]; // create the ticket in the gameworld @@ -346,7 +346,7 @@ public final class MercTicketManager final L2DefenderInstance npc = new L2DefenderInstance(template); npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp()); npc.setDecayed(false); - npc.spawnMe(x, y, (z + 20)); + npc.spawnMe(x, y, z + 20); if (despawnDelay > 0) { npc.scheduleDespawn(despawnDelay); @@ -413,7 +413,7 @@ public final class MercTicketManager * Gets the single instance of {@code MercTicketManager}. * @return single instance of {@code MercTicketManager} */ - public static final MercTicketManager getInstance() + public static MercTicketManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java index 1d1216b422..f38cc058e1 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/PcCafePointsManager.java @@ -85,7 +85,7 @@ public final class PcCafePointsManager * Gets the single instance of {@code PcCafePointsManager}. * @return single instance of {@code PcCafePointsManager} */ - public static final PcCafePointsManager getInstance() + public static PcCafePointsManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java index 223d67b5fd..9a889f0c27 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -108,12 +108,12 @@ public final class PetitionManager { if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - return (currPetition.endPetitionConsultation(PetitionState.PETITIONER_CANCEL)); + return currPetition.endPetitionConsultation(PetitionState.PETITIONER_CANCEL); } if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - return (currPetition.endPetitionConsultation(PetitionState.RESPONDER_CANCEL)); + return currPetition.endPetitionConsultation(PetitionState.RESPONDER_CANCEL); } } @@ -160,7 +160,7 @@ public final class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - return (currPetition.endPetitionConsultation(PetitionState.COMPLETED)); + return currPetition.endPetitionConsultation(PetitionState.COMPLETED); } } @@ -309,7 +309,7 @@ public final class PetitionManager } currPetition.setResponder(respondingAdmin); - return (currPetition.endPetitionConsultation(PetitionState.RESPONDER_REJECT)); + return currPetition.endPetitionConsultation(PetitionState.RESPONDER_REJECT); } public boolean sendActivePetitionMessage(L2PcInstance player, String messageText) @@ -374,8 +374,8 @@ public final class PetitionManager continue; } - StringUtil.append(htmlContent, ""); + StringUtil.append(htmlContent, "
", dateFormat.format(new Date(currPetition.getSubmitTime()))); - StringUtil.append(htmlContent, "", currPetition.getPetitioner().getName(), "
"); StringUtil.append(htmlContent, "
", dateFormat.format(new Date(currPetition.getSubmitTime()))); + StringUtil.append(htmlContent, "", currPetition.getPetitioner().getName(), "
"); if (currPetition.getState() != PetitionState.IN_PROCESS) { @@ -432,7 +432,7 @@ public final class PetitionManager html.replace("%time%", dateFormat.format(new Date(currPetition.getSubmitTime()))); html.replace("%type%", currPetition.getTypeAsString()); html.replace("%petitioner%", currPetition.getPetitioner().getName()); - html.replace("%online%", (currPetition.getPetitioner().isOnline() ? "00FF00" : "999999")); + html.replace("%online%", currPetition.getPetitioner().isOnline() ? "00FF00" : "999999"); html.replace("%text%", currPetition.getContent()); activeChar.sendPacket(html); @@ -442,7 +442,7 @@ public final class PetitionManager * Gets the single instance of {@code PetitionManager}. * @return single instance of {@code PetitionManager} */ - public static final PetitionManager getInstance() + public static PetitionManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/PremiumManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/PremiumManager.java index 503cf98011..85572d9345 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/PremiumManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/PremiumManager.java @@ -124,7 +124,7 @@ public class PremiumManager } } - public static final PremiumManager getInstance() + public static PremiumManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java index 552a7fadd5..96d4e5a59c 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/PunishmentManager.java @@ -123,7 +123,7 @@ public final class PunishmentManager * Gets the single instance of {@code PunishmentManager}. * @return single instance of {@code PunishmentManager} */ - public static final PunishmentManager getInstance() + public static PunishmentManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java index dfb343f4f9..ea5b938cb2 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/QuestManager.java @@ -187,7 +187,7 @@ public final class QuestManager extends ScriptManager if (Config.ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS) { - _log.info("Loaded quest " + Util.splitWords((quest.getName().contains("_") ? quest.getName().substring(quest.getName().indexOf('_') + 1) : quest.getName())) + "."); + _log.info("Loaded quest " + Util.splitWords(quest.getName().contains("_") ? quest.getName().substring(quest.getName().indexOf('_') + 1) : quest.getName()) + "."); } } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java index 7bc320ec2e..f680569c65 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java @@ -242,7 +242,7 @@ public class RaidBossSpawnManager } else { - _schedules.put(bossId, ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(bossId), (respawnTime - Calendar.getInstance().getTimeInMillis()))); + _schedules.put(bossId, ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(bossId), respawnTime - Calendar.getInstance().getTimeInMillis())); } _spawns.put(bossId, spawnDat); diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java index bc316c31c6..90c846a614 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeGuardManager.java @@ -239,7 +239,7 @@ public final class SiegeGuardManager ps.setInt(4, y); ps.setInt(5, z); ps.setInt(6, heading); - ps.setInt(7, (isHire == 1 ? 0 : 600)); + ps.setInt(7, isHire == 1 ? 0 : 600); ps.setInt(8, isHire); ps.execute(); } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java index cddee505e2..4773078932 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -294,7 +294,7 @@ public final class SiegeManager } } - public static final SiegeManager getInstance() + public static SiegeManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/TownManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/TownManager.java index 4b29321329..e046eb9788 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/TownManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/TownManager.java @@ -22,7 +22,7 @@ import com.l2jmobius.gameserver.model.zone.type.L2TownZone; public final class TownManager { - public static final int getTownCastle(int townId) + public static int getTownCastle(int townId) { switch (townId) { @@ -69,7 +69,7 @@ public final class TownManager } } - public static final boolean townHasCastleInSiege(int townId) + public static boolean townHasCastleInSiege(int townId) { final int castleIndex = getTownCastle(townId); @@ -84,12 +84,12 @@ public final class TownManager return false; } - public static final boolean townHasCastleInSiege(int x, int y) + public static boolean townHasCastleInSiege(int x, int y) { return townHasCastleInSiege(MapRegionManager.getInstance().getMapRegionLocId(x, y)); } - public static final L2TownZone getTown(int townId) + public static L2TownZone getTown(int townId) { for (L2TownZone temp : ZoneManager.getInstance().getAllZones(L2TownZone.class)) { @@ -108,7 +108,7 @@ public final class TownManager * @param z * @return */ - public static final L2TownZone getTown(int x, int y, int z) + public static L2TownZone getTown(int x, int y, int z) { for (L2ZoneType temp : ZoneManager.getInstance().getZones(x, y, z)) { diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java index 8041585e08..df80794453 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/WalkingManager.java @@ -285,36 +285,33 @@ public final class WalkingManager implements IXmlReader ThreadPoolManager.getInstance().scheduleGeneral(new StartMovingTask(npc, routeName), 60000); } } - else // walk was stopped due to some reason (arrived to node, script action, fight or something else), resume it + else if (_activeRoutes.containsKey(npc.getObjectId()) && ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))) { - if (_activeRoutes.containsKey(npc.getObjectId()) && ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))) + final WalkInfo walk = _activeRoutes.get(npc.getObjectId()); + if (walk == null) { - final WalkInfo walk = _activeRoutes.get(npc.getObjectId()); - if (walk == null) - { - return; - } - - // Prevent call simultaneously from scheduled task and onArrived() or temporarily stop walking for resuming in future - if (walk.isBlocked() || walk.isSuspended()) - { - npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (operation is blocked)"); - return; - } - - walk.setBlocked(true); - final L2NpcWalkerNode node = walk.getCurrentNode(); - npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); - npc.setIsRunning(node.runToLocation()); - npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); - walk.setBlocked(false); - walk.setStoppedByAttack(false); + return; } - else + + // Prevent call simultaneously from scheduled task and onArrived() or temporarily stop walking for resuming in future + if (walk.isBlocked() || walk.isSuspended()) { - npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (wrong AI state - " + npc.getAI().getIntention() + ")"); + npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (operation is blocked)"); + return; } + + walk.setBlocked(true); + final L2NpcWalkerNode node = walk.getCurrentNode(); + npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId()); + npc.setIsRunning(node.runToLocation()); + npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node); + walk.setBlocked(false); + walk.setStoppedByAttack(false); + } + else + { + npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (wrong AI state - " + npc.getAI().getIntention() + ")"); } } } @@ -455,7 +452,7 @@ public final class WalkingManager implements IXmlReader } } - public static final WalkingManager getInstance() + public static WalkingManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java b/trunk/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java index 0ab48cd9ea..1f4abc6921 100644 --- a/trunk/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java +++ b/trunk/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java @@ -515,11 +515,11 @@ public final class ZoneManager implements IXmlReader */ public T getZone(L2Object object, Class type) { - if (object == null) + if (object != null) { - return null; + return getZone(object.getX(), object.getY(), object.getZ(), type); } - return getZone(object.getX(), object.getY(), object.getZ(), type); + return null; } /** @@ -631,7 +631,7 @@ public final class ZoneManager implements IXmlReader { if ((temp instanceof L2ArenaZone) && temp.isCharacterInZone(character)) { - return ((L2ArenaZone) temp); + return (L2ArenaZone) temp; } } @@ -654,7 +654,7 @@ public final class ZoneManager implements IXmlReader { if ((temp instanceof L2OlympiadStadiumZone) && temp.isCharacterInZone(character)) { - return ((L2OlympiadStadiumZone) temp); + return (L2OlympiadStadiumZone) temp; } } return null; @@ -734,7 +734,7 @@ public final class ZoneManager implements IXmlReader * Gets the single instance of ZoneManager. * @return single instance of ZoneManager */ - public static final ZoneManager getInstance() + public static ZoneManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/trunk/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 77954de03e..4f9c98bd65 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/trunk/java/com/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -78,7 +78,7 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(L2PcInstance player) { - return (getLeaderObjectId() == player.getObjectId()); + return getLeaderObjectId() == player.getObjectId(); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/ArenaParticipantsHolder.java b/trunk/java/com/l2jmobius/gameserver/model/ArenaParticipantsHolder.java index a41328d60c..528e2d9258 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/ArenaParticipantsHolder.java +++ b/trunk/java/com/l2jmobius/gameserver/model/ArenaParticipantsHolder.java @@ -56,8 +56,7 @@ public final class ArenaParticipantsHolder public List getAllPlayers() { - final List all = new ArrayList<>(12); - all.addAll(_redPlayers); + final List all = new ArrayList<>(_redPlayers); all.addAll(_bluePlayers); return all; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java b/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java index 17daa45a2d..ae3e966d4e 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java +++ b/trunk/java/com/l2jmobius/gameserver/model/AutoSpawnHandler.java @@ -100,7 +100,7 @@ public class AutoSpawnHandler { if (asi != null) { - this.removeSpawn(asi); + removeSpawn(asi); } } @@ -314,7 +314,7 @@ public class AutoSpawnHandler public final long getTimeToNextSpawn(AutoSpawnInstance spawnInst) { final int objectId = spawnInst.getObjectId(); - return !isSpawnRegistered(objectId) ? -1 : (_runningSpawns.containsKey(objectId)) ? _runningSpawns.get(objectId).getDelay(TimeUnit.MILLISECONDS) : 0; + return !isSpawnRegistered(objectId) ? -1 : _runningSpawns.containsKey(objectId) ? _runningSpawns.get(objectId).getDelay(TimeUnit.MILLISECONDS) : 0; } /** @@ -486,7 +486,7 @@ public class AutoSpawnHandler // If there is no despawn time, do not create a despawn task. if (spawnInst.getDespawnDelay() > 0) { - ThreadPoolManager.getInstance().scheduleAi((new AutoDespawner(_objectId)), spawnInst.getDespawnDelay() - 1000); + ThreadPoolManager.getInstance().scheduleAi(new AutoDespawner(_objectId), spawnInst.getDespawnDelay() - 1000); } } catch (Exception e) diff --git a/trunk/java/com/l2jmobius/gameserver/model/CharEffectList.java b/trunk/java/com/l2jmobius/gameserver/model/CharEffectList.java index 304a0429ac..3217b7a237 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/CharEffectList.java +++ b/trunk/java/com/l2jmobius/gameserver/model/CharEffectList.java @@ -515,13 +515,13 @@ public final class CharEffectList if (_owner.isPlayer()) { _shortBuff = info; - if (info == null) + if (info != null) { - _owner.sendPacket(ShortBuffStatusUpdate.RESET_SHORT_BUFF); + _owner.sendPacket(new ShortBuffStatusUpdate(info.getSkill().getId(), info.getSkill().getLevel(), info.getTime())); } else { - _owner.sendPacket(new ShortBuffStatusUpdate(info.getSkill().getId(), info.getSkill().getLevel(), info.getTime())); + _owner.sendPacket(ShortBuffStatusUpdate.RESET_SHORT_BUFF); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/CursedWeapon.java b/trunk/java/com/l2jmobius/gameserver/model/CursedWeapon.java index 82c489d938..fb7505dee4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/CursedWeapon.java +++ b/trunk/java/com/l2jmobius/gameserver/model/CursedWeapon.java @@ -165,42 +165,39 @@ public class CursedWeapon implements INamable } } } - else + // either this cursed weapon is in the inventory of someone who has another cursed weapon equipped, + // OR this cursed weapon is on the ground. + else if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) { - // either this cursed weapon is in the inventory of someone who has another cursed weapon equipped, - // OR this cursed weapon is on the ground. - if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) + // Destroy + final L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); + if (!Config.FORCE_INVENTORY_UPDATE) { - // Destroy - final L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null); - if (!Config.FORCE_INVENTORY_UPDATE) + final InventoryUpdate iu = new InventoryUpdate(); + if (removedItem.getCount() == 0) { - final InventoryUpdate iu = new InventoryUpdate(); - if (removedItem.getCount() == 0) - { - iu.addRemovedItem(removedItem); - } - else - { - iu.addModifiedItem(removedItem); - } - - _player.sendPacket(iu); + iu.addRemovedItem(removedItem); } else { - _player.sendPacket(new ItemList(_player, true)); + iu.addModifiedItem(removedItem); } - _player.broadcastUserInfo(); + _player.sendPacket(iu); } - // is dropped on the ground - else if (_item != null) + else { - _item.decayMe(); - L2World.getInstance().removeObject(_item); - _log.info(_name + " item has been removed from World."); + _player.sendPacket(new ItemList(_player, true)); } + + _player.broadcastUserInfo(); + } + // is dropped on the ground + else if (_item != null) + { + _item.decayMe(); + L2World.getInstance().removeObject(_item); + _log.info(_name + " item has been removed from World."); } // Delete infos from table if any @@ -692,7 +689,7 @@ public class CursedWeapon implements INamable { return _skillMaxLevel; } - return (_nbKills / _stageKills); + return _nbKills / _stageKills; } public long getTimeLeft() diff --git a/trunk/java/com/l2jmobius/gameserver/model/ItemInfo.java b/trunk/java/com/l2jmobius/gameserver/model/ItemInfo.java index e63992c5b3..599e3d8bd3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/ItemInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/model/ItemInfo.java @@ -116,17 +116,17 @@ public class ItemInfo // Get the action to do clientside switch (item.getLastChange()) { - case (L2ItemInstance.ADDED): + case L2ItemInstance.ADDED: { _change = 1; break; } - case (L2ItemInstance.MODIFIED): + case L2ItemInstance.MODIFIED: { _change = 2; break; } - case (L2ItemInstance.REMOVED): + case L2ItemInstance.REMOVED: { _change = 3; break; diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2AccessLevel.java b/trunk/java/com/l2jmobius/gameserver/model/L2AccessLevel.java index 57e5c86edc..e10df56b61 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2AccessLevel.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2AccessLevel.java @@ -210,6 +210,6 @@ public class L2AccessLevel _childsAccessLevel = AdminData.getInstance().getAccessLevel(_child); } - return ((_childsAccessLevel.getLevel() == accessLevel.getLevel()) || _childsAccessLevel.hasChildAccess(accessLevel)); + return (_childsAccessLevel.getLevel() == accessLevel.getLevel()) || _childsAccessLevel.hasChildAccess(accessLevel); } } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2AdminCommandAccessRight.java b/trunk/java/com/l2jmobius/gameserver/model/L2AdminCommandAccessRight.java index 178b1c3416..534d161f15 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2AdminCommandAccessRight.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2AdminCommandAccessRight.java @@ -56,7 +56,7 @@ public class L2AdminCommandAccessRight public boolean hasAccess(L2AccessLevel characterAccessLevel) { final L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(_accessLevel); - return ((accessLevel.getLevel() == characterAccessLevel.getLevel()) || characterAccessLevel.hasChildAccess(accessLevel)); + return (accessLevel.getLevel() == characterAccessLevel.getLevel()) || characterAccessLevel.hasChildAccess(accessLevel); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2ArmorSet.java b/trunk/java/com/l2jmobius/gameserver/model/L2ArmorSet.java index 1cde1c6ba5..eb13ef731d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2ArmorSet.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2ArmorSet.java @@ -287,7 +287,7 @@ public final class L2ArmorSet final Inventory inv = player.getInventory(); final L2ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND); - return ((shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getId()))); + return (shieldItem != null) && _shield.contains(Integer.valueOf(shieldItem.getId())); } public boolean containShield(int shield_id) diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Augmentation.java b/trunk/java/com/l2jmobius/gameserver/model/L2Augmentation.java index 9846479f65..0486464612 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Augmentation.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Augmentation.java @@ -51,7 +51,7 @@ public final class L2Augmentation _active = false; final int[] stats = new int[2]; stats[0] = 0x0000FFFF & augmentationId; - stats[1] = (augmentationId >> 16); + stats[1] = augmentationId >> 16; for (int stat : stats) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Clan.java b/trunk/java/com/l2jmobius/gameserver/model/L2Clan.java index 35f48efff3..f47264271a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -201,7 +201,7 @@ public class L2Clan implements IIdentifiable, INamable */ public int getLeaderId() { - return (_leader != null ? _leader.getObjectId() : 0); + return _leader != null ? _leader.getObjectId() : 0; } /** @@ -849,7 +849,7 @@ public class L2Clan implements IIdentifiable, INamable */ public boolean isMember(int id) { - return ((id != 0) && _members.containsKey(id)); + return (id != 0) && _members.containsKey(id); } /** @@ -1113,7 +1113,7 @@ public class L2Clan implements IIdentifiable, INamable setAuctionBiddedAt(clanData.getInt("auction_bid_at"), false); setNewLeaderId(clanData.getInt("new_leader_id"), false); - final int leaderId = (clanData.getInt("leader_id")); + final int leaderId = clanData.getInt("leader_id"); ps.clearParameters(); @@ -1398,15 +1398,12 @@ public class L2Clan implements IIdentifiable, INamable temp.getPlayerInstance().sendSkillList(); } } - else + else if (temp.getPledgeType() == subType) { - if (temp.getPledgeType() == subType) - { - temp.getPlayerInstance().addSkill(newSkill, false); // Skill is not saved to player DB - temp.getPlayerInstance().sendPacket(new ExSubPledgeSkillAdd(subType, newSkill.getId(), newSkill.getLevel())); - temp.getPlayerInstance().sendPacket(sm); - temp.getPlayerInstance().sendSkillList(); - } + temp.getPlayerInstance().addSkill(newSkill, false); // Skill is not saved to player DB + temp.getPlayerInstance().sendPacket(new ExSubPledgeSkillAdd(subType, newSkill.getId(), newSkill.getLevel())); + temp.getPlayerInstance().sendPacket(sm); + temp.getPlayerInstance().sendSkillList(); } } } @@ -1794,7 +1791,7 @@ public class L2Clan implements IIdentifiable, INamable while (rset.next()) { final int id = rset.getInt("sub_pledge_id"); - _subPledges.put(id, (new SubPledge(id, rset.getString("name"), rset.getInt("leader_id")))); + _subPledges.put(id, new SubPledge(id, rset.getString("name"), rset.getInt("leader_id"))); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Crest.java b/trunk/java/com/l2jmobius/gameserver/model/L2Crest.java index 7ed9dcbf59..a333c610a8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Crest.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Crest.java @@ -112,13 +112,13 @@ public final class L2Crest implements IIdentifiable if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); + System.arraycopy(data, 14336 * i, fullChunk, 0, 14336); activeChar.sendPacket(new ExPledgeEmblem(getId(), fullChunk, 0, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); + System.arraycopy(data, 14336 * i, lastChunk, 0, 8320); activeChar.sendPacket(new ExPledgeEmblem(getId(), lastChunk, 0, i)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2NpcWalkerNode.java b/trunk/java/com/l2jmobius/gameserver/model/L2NpcWalkerNode.java index c16d7fb4aa..8ad2a2f2bb 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2NpcWalkerNode.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2NpcWalkerNode.java @@ -35,7 +35,7 @@ public class L2NpcWalkerNode extends Location _delay = delay; _runToLocation = runToLocation; _npcString = npcString; - _chatString = ((chatText == null) ? "" : chatText); + _chatString = (chatText == null) ? "" : chatText; } public int getDelay() diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Object.java b/trunk/java/com/l2jmobius/gameserver/model/L2Object.java index d9e55a53eb..c25f7fc109 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Object.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Object.java @@ -892,7 +892,7 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) { final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0); - return (squared) ? distance : Math.sqrt(distance); + return squared ? distance : Math.sqrt(distance); } /** @@ -1014,12 +1014,12 @@ public abstract class L2Object extends ListenersContainer implements IIdentifiab @Override public boolean equals(Object obj) { - return ((obj instanceof L2Object) && (((L2Object) obj).getObjectId() == getObjectId())); + return (obj instanceof L2Object) && (((L2Object) obj).getObjectId() == getObjectId()); } @Override public String toString() { - return (getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"); + return getClass().getSimpleName() + ":" + getName() + "[" + getObjectId() + "]"; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2Party.java b/trunk/java/com/l2jmobius/gameserver/model/L2Party.java index ee78a46a8d..a72e167ff1 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2Party.java @@ -145,7 +145,7 @@ public class L2Party extends AbstractPlayerGroup */ public boolean isInvitationRequestExpired() { - return (_pendingInviteTimeout <= GameTimeController.getInstance().getGameTicks()); + return _pendingInviteTimeout <= GameTimeController.getInstance().getGameTicks(); } /** @@ -413,28 +413,17 @@ public class L2Party extends AbstractPlayerGroup // Add the new sign _tacticalSigns.put(tacticalSignId, target); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(target, tacticalSignId))); + } + else if (tacticalTarget == target) + { + _tacticalSigns.remove(tacticalSignId); } else { - // Sign already assigned - // If the sign is applied on the same target, remove it - if (tacticalTarget == target) - { - _tacticalSigns.remove(tacticalSignId); - getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(tacticalTarget, 0))); - } - else - { - // Otherwise, delete the old sign, and apply it to the new target - _tacticalSigns.replace(tacticalSignId, target); - getMembers().forEach(m -> - { - m.sendPacket(new ExTacticalSign(tacticalTarget, 0)); - m.sendPacket(new ExTacticalSign(target, tacticalSignId)); - }); - } + // Otherwise, delete the old sign, and apply it to the new target + _tacticalSigns.replace(tacticalSignId, target); } + getMembers().forEach(m -> m.sendPacket(new ExTacticalSign(target, tacticalSignId))); } public void setTargetBasedOnTacticalSignId(L2PcInstance player, int tacticalSignId) @@ -488,7 +477,7 @@ public class L2Party extends AbstractPlayerGroup try { // Channeling a player! - if (player.isChanneling() && (player.getSkillChannelizer().hasChannelized())) + if (player.isChanneling() && player.getSkillChannelizer().hasChannelized()) { player.abortCast(); } @@ -813,7 +802,7 @@ public class L2Party extends AbstractPlayerGroup int sqLevelSum = 0; for (L2PcInstance member : validMembers) { - sqLevelSum += (member.getLevel() * member.getLevel()); + sqLevelSum += member.getLevel() * member.getLevel(); } final int vitalityPoints = (int) ((target.getVitalityPoints(partyDmg) * Config.RATE_PARTY_XP) / validMembers.size()); @@ -849,7 +838,7 @@ public class L2Party extends AbstractPlayerGroup if (addexp > 0) { member.updateVitalityPoints(vitalityPoints, true, false); - PcCafePointsManager.getInstance().givePcCafePoint((member), addexp); + PcCafePointsManager.getInstance().givePcCafePoint(member, addexp); } } else @@ -929,7 +918,7 @@ public class L2Party extends AbstractPlayerGroup int sqLevelSum = 0; for (L2PcInstance member : members) { - sqLevelSum += (member.getLevel() * member.getLevel()); + sqLevelSum += member.getLevel() * member.getLevel(); } for (L2PcInstance member : members) @@ -946,7 +935,7 @@ public class L2Party extends AbstractPlayerGroup int sqLevelSum = 0; for (L2PcInstance member : members) { - sqLevelSum += (member.getLevel() * member.getLevel()); + sqLevelSum += member.getLevel() * member.getLevel(); } int i = members.size() - 1; @@ -996,12 +985,12 @@ public class L2Party extends AbstractPlayerGroup private double getExpBonus(int membersCount) { - return (membersCount < 2) ? (getBaseExpSpBonus(membersCount)) : (getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_XP); + return (membersCount < 2) ? getBaseExpSpBonus(membersCount) : (getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_XP); } private double getSpBonus(int membersCount) { - return (membersCount < 2) ? (getBaseExpSpBonus(membersCount)) : (getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_SP); + return (membersCount < 2) ? getBaseExpSpBonus(membersCount) : (getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_SP); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2PetData.java b/trunk/java/com/l2jmobius/gameserver/model/L2PetData.java index 35ca6db3a3..85d7148236 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2PetData.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2PetData.java @@ -188,7 +188,7 @@ public class L2PetData { if (petLvl < 70) { - lvl = (petLvl / 10); + lvl = petLvl / 10; if (lvl <= 0) { lvl = 1; @@ -196,7 +196,7 @@ public class L2PetData } else { - lvl = (7 + ((petLvl - 70) / 5)); + lvl = 7 + ((petLvl - 70) / 5); } // formula usable for skill that have 10 or more skill levels diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2World.java b/trunk/java/com/l2jmobius/gameserver/model/L2World.java index e9712004dc..da05c2bc2f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2World.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2World.java @@ -71,9 +71,9 @@ public final class L2World /** Map containing all the players in game. */ private final Map _allPlayers = new ConcurrentHashMap<>(); /** Map containing all the Good players in game. */ - private final static Map _allGoodPlayers = new ConcurrentHashMap<>(); + private static final Map _allGoodPlayers = new ConcurrentHashMap<>(); /** Map containing all the Evil players in game. */ - private final static Map _allEvilPlayers = new ConcurrentHashMap<>(); + private static final Map _allEvilPlayers = new ConcurrentHashMap<>(); /** Map containing all visible objects. */ private final Map _allObjects = new ConcurrentHashMap<>(); /** Map with the pets instances and their owner ID. */ @@ -581,7 +581,7 @@ public final class L2World */ private boolean validRegion(int x, int y) { - return ((x >= 0) && (x <= REGIONS_X) && (y >= 0) && (y <= REGIONS_Y)); + return (x >= 0) && (x <= REGIONS_X) && (y >= 0) && (y <= REGIONS_Y); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/L2WorldRegion.java b/trunk/java/com/l2jmobius/gameserver/model/L2WorldRegion.java index 39db2a3761..a4eb8378f6 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/L2WorldRegion.java +++ b/trunk/java/com/l2jmobius/gameserver/model/L2WorldRegion.java @@ -376,7 +376,7 @@ public final class L2WorldRegion _allPlayable.put(object.getObjectId(), (L2Playable) object); // if this is the first player to enter the region, activate self & neighbors - if ((_allPlayable.size() == 1) && (!Config.GRIDS_ALWAYS_ON)) + if ((_allPlayable.size() == 1) && !Config.GRIDS_ALWAYS_ON) { startActivation(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/MobGroupTable.java b/trunk/java/com/l2jmobius/gameserver/model/MobGroupTable.java index 791f44a060..d5de7d3c3a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/MobGroupTable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/MobGroupTable.java @@ -76,7 +76,7 @@ public class MobGroupTable public boolean removeGroup(int groupKey) { - return (_groupMap.remove(groupKey) != null); + return _groupMap.remove(groupKey) != null; } private static class SingletonHolder diff --git a/trunk/java/com/l2jmobius/gameserver/model/Petition.java b/trunk/java/com/l2jmobius/gameserver/model/Petition.java index c6d78a70d8..87e7d9c26c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/Petition.java +++ b/trunk/java/com/l2jmobius/gameserver/model/Petition.java @@ -98,7 +98,7 @@ public final class Petition } PetitionManager.getInstance().getCompletedPetitions().put(getId(), this); - return (PetitionManager.getInstance().getPendingPetitions().remove(getId()) != null); + return PetitionManager.getInstance().getPendingPetitions().remove(getId()) != null; } public String getContent() diff --git a/trunk/java/com/l2jmobius/gameserver/model/SpawnListener.java b/trunk/java/com/l2jmobius/gameserver/model/SpawnListener.java index 6d1e74875b..dacec73ab1 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/SpawnListener.java +++ b/trunk/java/com/l2jmobius/gameserver/model/SpawnListener.java @@ -25,5 +25,5 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; public interface SpawnListener { - public void npcSpawned(L2Npc npc); + void npcSpawned(L2Npc npc); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/StatsSet.java b/trunk/java/com/l2jmobius/gameserver/model/StatsSet.java index 5b59b3c365..9a98102ce3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/StatsSet.java +++ b/trunk/java/com/l2jmobius/gameserver/model/StatsSet.java @@ -640,7 +640,7 @@ public class StatsSet implements IParserAdvUtils public void safeSet(String key, int value, int min, int max, String reference) { - assert !(((min <= max) && ((value < min) || (value >= max)))); + assert ((min > max) || ((value >= min) && (value < max))); if ((min <= max) && ((value < min) || (value >= max))) { _log.log(Level.SEVERE, "Incorrect value: " + value + "for: " + key + "Ref: " + reference); diff --git a/trunk/java/com/l2jmobius/gameserver/model/TradeList.java b/trunk/java/com/l2jmobius/gameserver/model/TradeList.java index 2925da202d..0bd941904d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/TradeList.java +++ b/trunk/java/com/l2jmobius/gameserver/model/TradeList.java @@ -217,7 +217,7 @@ public class TradeList } final L2ItemInstance item = (L2ItemInstance) o; - if (!(item.isTradeable() || (getOwner().isGM() && Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) + if ((!item.isTradeable() && (!getOwner().isGM() || !Config.GM_TRADE_RESTRICTED_ITEMS)) || item.isQuestItem()) { _log.warning(_owner.getName() + ": Attempt to add a restricted item!"); return null; @@ -614,12 +614,12 @@ public class TradeList boolean success = false; // check weight and slots - if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) + if (!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight()) || !partnerList.getOwner().getInventory().validateWeight(calcItemsWeight())) { partnerList.getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); getOwner().sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_WEIGHT_LIMIT); } - else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) + else if (!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner())) || !partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner()))) { partnerList.getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); getOwner().sendPacket(SystemMessageId.YOUR_INVENTORY_IS_FULL); diff --git a/trunk/java/com/l2jmobius/gameserver/model/UIKeysSettings.java b/trunk/java/com/l2jmobius/gameserver/model/UIKeysSettings.java index 386238c33c..c82870131f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/UIKeysSettings.java +++ b/trunk/java/com/l2jmobius/gameserver/model/UIKeysSettings.java @@ -100,7 +100,7 @@ public class UIKeysSettings int order = 0; for (int key : _storedCategories.get(category)) { - query += "(" + _playerObjId + ", " + category + ", " + (order++) + ", " + key + "),"; + query += "(" + _playerObjId + ", " + category + ", " + order++ + ", " + key + "),"; } } query = query.substring(0, query.length() - 1) + "; "; diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 4524722a5d..ee26a015ab 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -216,12 +216,9 @@ public class L2Attackable extends L2Npc return; } } - else + else if (isPhysicalMuted()) { - if (isPhysicalMuted()) - { - return; - } + return; } } @@ -346,7 +343,7 @@ public class L2Attackable extends L2Npc final int hpRestore = (int) killer.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null); if (hpRestore > 0) { - final double amount = Math.max(Math.min(((killer.getMaxHp() * hpRestore) / 100), killer.getMaxRecoverableHp() - killer.getCurrentHp()), 0); + final double amount = Math.max(Math.min((killer.getMaxHp() * hpRestore) / 100, killer.getMaxRecoverableHp() - killer.getCurrentHp()), 0); if (amount != 0) { killer.setCurrentHp(amount + killer.getCurrentHp()); @@ -360,7 +357,7 @@ public class L2Attackable extends L2Npc final L2MonsterInstance mob = (L2MonsterInstance) this; if ((mob.getLeader() != null) && mob.getLeader().hasMinions()) { - mob.getLeader().getMinionList().onMinionDie(mob, (Config.MINIONS_RESPAWN_TIME.containsKey(getId()) ? Config.MINIONS_RESPAWN_TIME.get(getId()) * 1000 : -1)); + mob.getLeader().getMinionList().onMinionDie(mob, Config.MINIONS_RESPAWN_TIME.containsKey(getId()) ? Config.MINIONS_RESPAWN_TIME.get(getId()) * 1000 : -1); } if (mob.hasMinions()) @@ -528,7 +525,7 @@ public class L2Attackable extends L2Npc if (addexp > 0) { attacker.updateVitalityPoints(getVitalityPoints(damage), true, false); - PcCafePointsManager.getInstance().givePcCafePoint((attacker), addexp); + PcCafePointsManager.getInstance().givePcCafePoint(attacker, addexp); } } } @@ -569,17 +566,12 @@ public class L2Attackable extends L2Npc } rewards.remove(partyPlayer); // Remove the L2PcInstance from the L2Attackable rewards } - else + else if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, partyPlayer, true)) { - // Add L2PcInstance of the party (that have attacked or not) to members that can be rewarded - // and in range of the monster. - if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, this, partyPlayer, true)) + rewardedMembers.add(partyPlayer); + if (partyPlayer.getLevel() > partyLvl) { - rewardedMembers.add(partyPlayer); - if (partyPlayer.getLevel() > partyLvl) - { - partyLvl = attackerParty.isInCommandChannel() ? attackerParty.getCommandChannel().getLevel() : partyPlayer.getLevel(); - } + partyLvl = attackerParty.isInCommandChannel() ? attackerParty.getCommandChannel().getLevel() : partyPlayer.getLevel(); } } } @@ -587,7 +579,7 @@ public class L2Attackable extends L2Npc // If the party didn't killed this L2Attackable alone if (partyDmg < totalDamage) { - partyMul = ((float) partyDmg / totalDamage); + partyMul = (float) partyDmg / totalDamage; } // Calculate the level difference between Party and L2Attackable @@ -1292,13 +1284,13 @@ public class L2Attackable extends L2Npc final AbsorberInfo ai = _absorbersList.get(attacker.getObjectId()); // If the L2Character attacker isn't already in the _absorbersList of this L2Attackable, add it - if (ai == null) + if (ai != null) { - _absorbersList.put(attacker.getObjectId(), new AbsorberInfo(attacker.getObjectId(), getCurrentHp())); + ai.setAbsorbedHp(getCurrentHp()); } else { - ai.setAbsorbedHp(getCurrentHp()); + _absorbersList.put(attacker.getObjectId(), new AbsorberInfo(attacker.getObjectId(), getCurrentHp())); } // Set this L2Attackable as absorbed @@ -1375,7 +1367,7 @@ public class L2Attackable extends L2Npc public long calculateOverhitExp(long normalExp) { // Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) ammount of HP on the L2Attackable - double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp()); + double overhitPercentage = (getOverhitDamage() * 100) / getMaxHp(); // Over-hit damage percentages are limited to 25% max if (overhitPercentage > 25) @@ -1383,7 +1375,7 @@ public class L2Attackable extends L2Npc overhitPercentage = 25; } - return Math.round(((overhitPercentage / 100) * normalExp)); + return Math.round((overhitPercentage / 100) * normalExp); } /** @@ -1557,7 +1549,7 @@ public class L2Attackable extends L2Npc @Override public boolean hasRandomAnimation() { - return ((Config.MAX_MONSTER_ANIMATION > 0) && isRandomAnimationEnabled() && !(this instanceof L2GrandBossInstance)); + return (Config.MAX_MONSTER_ANIMATION > 0) && isRandomAnimationEnabled() && !(this instanceof L2GrandBossInstance); } @Override @@ -1634,7 +1626,7 @@ public class L2Attackable extends L2Npc */ public boolean useVitalityRate() { - return (!isChampion() || Config.L2JMOD_CHAMPION_ENABLE_VITALITY); + return !isChampion() || Config.L2JMOD_CHAMPION_ENABLE_VITALITY; } /** Return True if the L2Character is RaidBoss or his minion. */ diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Character.java index fa7d871634..81c2f88ab4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -759,7 +759,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void teleToLocation(int x, int y, int z, int heading, int instanceId, boolean randomOffset) { - teleToLocation(x, y, z, heading, instanceId, (randomOffset) ? Config.MAX_OFFSET_ON_TELEPORT : 0); + teleToLocation(x, y, z, heading, instanceId, randomOffset ? Config.MAX_OFFSET_ON_TELEPORT : 0); } public void teleToLocation(int x, int y, int z, int heading, int instanceId) @@ -769,7 +769,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void teleToLocation(int x, int y, int z, int heading, boolean randomOffset) { - teleToLocation(x, y, z, heading, -1, (randomOffset) ? Config.MAX_OFFSET_ON_TELEPORT : 0); + teleToLocation(x, y, z, heading, -1, randomOffset ? Config.MAX_OFFSET_ON_TELEPORT : 0); } public void teleToLocation(int x, int y, int z, int heading) @@ -779,7 +779,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void teleToLocation(int x, int y, int z, boolean randomOffset) { - teleToLocation(x, y, z, 0, -1, (randomOffset) ? Config.MAX_OFFSET_ON_TELEPORT : 0); + teleToLocation(x, y, z, 0, -1, randomOffset ? Config.MAX_OFFSET_ON_TELEPORT : 0); } public void teleToLocation(int x, int y, int z) @@ -799,7 +799,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public void teleToLocation(ILocational loc, boolean randomOffset) { - teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), loc.getInstanceId(), (randomOffset) ? Config.MAX_OFFSET_ON_TELEPORT : 0); + teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), loc.getInstanceId(), randomOffset ? Config.MAX_OFFSET_ON_TELEPORT : 0); } public void teleToLocation(ILocational loc) @@ -844,7 +844,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sendPacket(ActionFailed.STATIC_PACKET); return false; } - final int mpConsume = (int) calcStat(Stats.BOW_MP_CONSUME_RATE, ((weaponItem.getReducedMpConsume() > 0) && (Rnd.get(100) < weaponItem.getReducedMpConsumeChance()) ? weaponItem.getReducedMpConsume() : weaponItem.getMpConsume()), null, null); + final int mpConsume = (int) calcStat(Stats.BOW_MP_CONSUME_RATE, (weaponItem.getReducedMpConsume() > 0) && (Rnd.get(100) < weaponItem.getReducedMpConsumeChance()) ? weaponItem.getReducedMpConsume() : weaponItem.getMpConsume(), null, null); if (getCurrentMp() < mpConsume) { // If L2PcInstance doesn't have enough MP, stop the attack @@ -1078,23 +1078,20 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { abortAttack(); // Abort the attack of the L2Character and send Server->Client ActionFailed packet } - else + else if (player != null) { - if (player != null) + if (player.isCursedWeaponEquipped()) { - if (player.isCursedWeaponEquipped()) + // If hit by a cursed weapon, CP is reduced to 0 + if (!target.isInvul()) { - // If hit by a cursed weapon, CP is reduced to 0 - if (!target.isInvul()) - { - target.setCurrentCp(0); - } - } - else if (player.isHero() && target.isPlayer() && target.getActingPlayer().isCursedWeaponEquipped()) - { - target.setCurrentCp(0); // If a cursed weapon is hit by a Hero, CP is reduced to 0 + target.setCurrentCp(0); } } + else if (player.isHero() && target.isPlayer() && target.getActingPlayer().isCursedWeaponEquipped()) + { + target.setCurrentCp(0); // If a cursed weapon is hit by a Hero, CP is reduced to 0 + } } // If the Server->Client packet Attack contains at least 1 hit, send the Server->Client packet Attack @@ -1319,7 +1316,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe attack.addHit(target, damage2, miss2, crit2, shld2); // Return true if hit 1 or hit 2 isn't missed - return (!miss1 || !miss2); + return !miss1 || !miss2; } /** @@ -1729,7 +1726,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final int magicId = skill.getId(); // Get the Base Casting Time of the Skills. - int skillTime = (skill.getHitTime() + skill.getCoolTime()); + int skillTime = skill.getHitTime() + skill.getCoolTime(); if (!skill.isChanneling() || (skill.getChannelingSkillId() == 0)) { @@ -1780,7 +1777,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe int reuseDelay; if (skill.isStaticReuse() || skill.isStatic()) { - reuseDelay = (skill.getReuseDelay()); + reuseDelay = skill.getReuseDelay(); } else if (skill.isMagic()) { @@ -2016,15 +2013,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return false; } } - else + // Check if the skill is physical and if the L2Character is not physical_muted + else if (isPhysicalMuted()) { - // Check if the skill is physical and if the L2Character is not physical_muted - if (isPhysicalMuted()) - { - // Send a Server->Client packet ActionFailed to the L2PcInstance - sendPacket(ActionFailed.STATIC_PACKET); - return false; - } + // Send a Server->Client packet ActionFailed to the L2PcInstance + sendPacket(ActionFailed.STATIC_PACKET); + return false; } } @@ -2159,7 +2153,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param itemObjId the item object ID * @return if the item has a reuse time stamp, the remaining time, otherwise -1 */ - public synchronized final long getItemRemainingReuseTime(int itemObjId) + public final synchronized long getItemRemainingReuseTime(int itemObjId) { final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null; return reuseStamp != null ? reuseStamp.getRemaining() : -1; @@ -2230,7 +2224,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * Removes a skill reuse time stamp. * @param skill the skill to remove */ - public synchronized final void removeTimeStamp(Skill skill) + public final synchronized void removeTimeStamp(Skill skill) { if (_reuseTimeStampsSkills != null) { @@ -2241,7 +2235,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** * Removes all skill reuse time stamps. */ - public synchronized final void resetTimeStamps() + public final synchronized void resetTimeStamps() { if (_reuseTimeStampsSkills != null) { @@ -2254,7 +2248,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return if the skill has a reuse time stamp, the remaining time, otherwise -1 */ - public synchronized final long getSkillRemainingReuseTime(int hashCode) + public final synchronized long getSkillRemainingReuseTime(int hashCode) { final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null; return reuseStamp != null ? reuseStamp.getRemaining() : -1; @@ -2265,7 +2259,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return {@code true} if the skill is under reuse time, {@code false} otherwise */ - public synchronized final boolean hasSkillReuse(int hashCode) + public final synchronized boolean hasSkillReuse(int hashCode) { final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null; return (reuseStamp != null) && reuseStamp.hasNotPassed(); @@ -2276,7 +2270,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe * @param hashCode the skill hash code * @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null} */ - public synchronized final TimeStamp getSkillReuseTimeStamp(int hashCode) + public final synchronized TimeStamp getSkillReuseTimeStamp(int hashCode) { return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null; } @@ -2333,7 +2327,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe /** * Removes all the disabled skills. */ - public synchronized final void resetDisabledSkills() + public final synchronized void resetDisabledSkills() { if (_disabledSkills != null) { @@ -3012,7 +3006,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe @Override public CharKnownList getKnownList() { - return ((CharKnownList) super.getKnownList()); + return (CharKnownList) super.getKnownList(); } @Override @@ -3105,13 +3099,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public final void setTitle(String value) { - if (value == null) + if (value != null) { - _title = ""; + _title = value.length() > 21 ? value.substring(0, 20) : value; } else { - _title = value.length() > 21 ? value.substring(0, 20) : value; + _title = ""; } } @@ -3734,7 +3728,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else { - final boolean broadcastFull = true; final StatusUpdate su = new StatusUpdate(this); UserInfo info = null; if (isPlayer()) @@ -3829,17 +3822,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe player.refreshExpertisePenalty(); sendPacket(info); - if (broadcastFull) { player.broadcastPacket(new CharInfo(player)); } - else - { - if (su.hasAttributes()) - { - broadcastPacket(su); - } - } if (hasServitors() && isAffected(EffectFlag.SERVITOR_SHARE)) { getServitors().values().forEach(L2Summon::broadcastStatusUpdate); @@ -3847,7 +3832,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } else if (isNpc()) { - if (broadcastFull) { for (L2PcInstance player : getKnownList().getKnownPlayers().values()) { @@ -3865,10 +3849,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } } - else if (su.hasAttributes()) - { - broadcastPacket(su); - } } else if (su.hasAttributes()) { @@ -4092,8 +4072,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER); // Z coordinate will follow geodata or client values - if ((Config.COORD_SYNCHRONIZE == 2) && !isFloating && !m.disregardingGeodata && ((GameTimeController.getInstance().getGameTicks() % 10) == 0 // once a second to reduce possible cpu load - ) && GeoData.getInstance().hasGeo(xPrev, yPrev)) + if ((Config.COORD_SYNCHRONIZE == 2) && !isFloating && !m.disregardingGeodata && ((GameTimeController.getInstance().getGameTicks() % 10) == 0) && GeoData.getInstance().hasGeo(xPrev, yPrev)) { final int geoHeight = GeoData.getInstance().getSpawnHeight(xPrev, yPrev, zPrev); dz = m._zDestination - geoHeight; @@ -4133,7 +4112,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe m._yAccurate += dy * distFraction; // Set the position of the L2Character to estimated after parcial move - super.setXYZ((int) (m._xAccurate), (int) (m._yAccurate), zPrev + (int) ((dz * distFraction) + 0.5)); + super.setXYZ((int) m._xAccurate, (int) m._yAccurate, zPrev + (int) ((dz * distFraction) + 0.5)); } revalidateZone(false); @@ -4328,9 +4307,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Calculate distance (dx,dy) between current position and destination // TODO: improve Z axis move/follow support when dx,dy are small compared to dz - double dx = (x - curX); - double dy = (y - curY); - double dz = (z - curZ); + double dx = x - curX; + double dy = y - curY; + double dz = z - curZ; double distance = Math.sqrt((dx * dx) + (dy * dy)); final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0); @@ -4347,9 +4326,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe x = curX + (int) (divider * dx); y = curY + (int) (divider * dy); z = curZ + (int) (divider * dz); - dx = (x - curX); - dy = (y - curY); - dz = (z - curZ); + dx = x - curX; + dy = y - curY; + dz = z - curZ; distance = Math.sqrt((dx * dx) + (dy * dy)); } @@ -4391,7 +4370,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe sin = dy / distance; cos = dx / distance; - distance -= (offset - 5); // due to rounding error, we have to move a bit closer to be in range + distance -= offset - 5; // due to rounding error, we have to move a bit closer to be in range // Calculate the new destination with offset included x = curX + (int) (distance * cos); @@ -4429,8 +4408,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // Movement checks: // When pathfinding enabled, for all characters except monsters returning home (could be changed later to teleport if pathfinding fails) - if (((Config.PATHFINDING > 0) && (!(isAttackable() && ((L2Attackable) this).isReturningToSpawnPoint()))) // - || (isPlayer() && !(isInVehicle && (distance > 1500)))) + if (((Config.PATHFINDING > 0) && (!isAttackable() || !((L2Attackable) this).isReturningToSpawnPoint())) // + || (isPlayer() && (!isInVehicle || (distance <= 1500)))) { if (isOnGeodataPath()) { @@ -4640,8 +4619,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ(); - final double dx = (m._xDestination - super.getX()); - final double dy = (m._yDestination - super.getY()); + final double dx = m._xDestination - super.getX(); + final double dy = m._yDestination - super.getY(); final double distance = Math.sqrt((dx * dx) + (dy * dy)); // Calculate and set the heading of the L2Character if (distance != 0) @@ -4692,7 +4671,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe boolean result = true; if (m._heading != heading) { - result = (m._heading == 0); // initial value or false + result = m._heading == 0; // initial value or false m._heading = heading; } @@ -4725,7 +4704,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public final boolean isInsideRadius(int x, int y, int z, int radius, boolean checkZAxis, boolean strictCheck) { final double distance = calculateDistance(x, y, z, checkZAxis, true); - return (strictCheck) ? (distance < (radius * radius)) : (distance <= (radius * radius)); + return strictCheck ? (distance < (radius * radius)) : (distance <= (radius * radius)); } /** @@ -4876,7 +4855,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (!miss && (damage > 0)) { final L2Weapon weapon = getActiveWeaponItem(); - final boolean isBow = ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))); + final boolean isBow = (weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW)); int reflectedDamage = 0; if (!isBow && !target.isInvul() && (!target.isRaid() || (getActingPlayer() == null) || (getActingPlayer().getLevel() <= (target.getLevel() + 8)))) // Do not reflect if weapon is of type bow or target is invunlerable @@ -5120,7 +5099,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isInsidePeaceZone(L2PcInstance attacker, L2Object target) { - return (!attacker.getAccessLevel().allowPeaceAttack() && isInsidePeaceZone((L2Object) attacker, target)); + return !attacker.getAccessLevel().allowPeaceAttack() && isInsidePeaceZone((L2Object) attacker, target); } public boolean isInsidePeaceZone(L2Object attacker, L2Object target) @@ -5129,7 +5108,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { return false; } - if (!(target.isPlayable() && attacker.isPlayable())) + if (!target.isPlayable() || !attacker.isPlayable()) { return false; } @@ -5151,7 +5130,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } } - return (target.isInsideZone(ZoneId.PEACE) || attacker.isInsideZone(ZoneId.PEACE)); + return target.isInsideZone(ZoneId.PEACE) || attacker.isInsideZone(ZoneId.PEACE); } /** @@ -5160,7 +5139,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe public boolean isInActiveRegion() { final L2WorldRegion region = getWorldRegion(); - return ((region != null) && (region.isActive())); + return (region != null) && region.isActive(); } /** @@ -5441,13 +5420,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe continue; } } - else + else if (((L2Character) target).isInsidePeaceZone(this, target)) { - if (((L2Character) target).isInsidePeaceZone(this, target)) - { - skipPeaceZone++; - continue; - } + skipPeaceZone++; + continue; } } targetList.add(target); @@ -5619,16 +5595,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { onMagicFinalizer(mut); } + else if (mut.isSimultaneous()) + { + _skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, 300); + } else { - if (mut.isSimultaneous()) - { - _skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, 300); - } - else - { - _skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 300); - } + _skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 300); } } @@ -5660,7 +5633,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe } // Attack target after skill use - if ((skill.nextActionIsAttack()) && (getTarget() instanceof L2Character) && (getTarget() != this) && (target != null) && (getTarget() == target) && target.canBeAttacked()// + if (skill.nextActionIsAttack() && (getTarget() instanceof L2Character) && (getTarget() != this) && (target != null) && (getTarget() == target) && target.canBeAttacked()// && ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO))) { getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target); @@ -5822,7 +5795,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe // attack of the own pet does not flag player // triggering trap not flag trap owner - if ((player.getPet() != target) && !player.hasServitor(target.getObjectId()) && !isTrap() && !((skill.getEffectPoint() == 0) && (skill.getAffectRange() > 0))) + if ((player.getPet() != target) && !player.hasServitor(target.getObjectId()) && !isTrap() && ((skill.getEffectPoint() != 0) || (skill.getAffectRange() <= 0))) { player.updatePvPStatus((L2Character) target); } @@ -5849,21 +5822,18 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe ((L2Character) target).getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this); } } - else + else if (target.isPlayer()) { - if (target.isPlayer()) - { - // Casting non offensive skill on player with pvp flag set or with karma - if (!(target.equals(this) || target.equals(player)) && ((target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0))) - { - player.updatePvPStatus(); - } - } - else if (target.isAttackable()) + // Casting non offensive skill on player with pvp flag set or with karma + if (!target.equals(this) && !target.equals(player) && ((target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0))) { player.updatePvPStatus(); } } + else if (target.isAttackable()) + { + player.updatePvPStatus(); + } } } @@ -5873,7 +5843,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if ((spMob != null) && spMob.isNpc()) { final L2Npc npcMob = (L2Npc) spMob; - if ((npcMob.isInsideRadius(player, 1000, true, true))) + if (npcMob.isInsideRadius(player, 1000, true, true)) { EventDispatcher.getInstance().notifyEventAsync(new OnNpcSkillSee(npcMob, player, skill, targets, isSummon()), npcMob); @@ -5906,7 +5876,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { if ((npcTarget == skillTarget) || (npcMob == skillTarget)) { - attackable.addDamageHate((isSummon() ? this : player), 0, (skillEffectPoint * 150) / (attackable.getLevel() + 7)); + attackable.addDamageHate(isSummon() ? this : player, 0, (skillEffectPoint * 150) / (attackable.getLevel() + 7)); } } } @@ -6041,7 +6011,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe */ public double getLevelMod() { - return ((getLevel() + 89) / 100d); + return (getLevel() + 89) / 100d; } public final void setSkillCast(Future newSkillCast) @@ -6075,7 +6045,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe final L2Weapon activeWeapon = getActiveWeaponItem(); final int random = activeWeapon != null ? activeWeapon.getRandomDamage() : 5 + (int) Math.sqrt(getLevel()); - return (1 + ((double) Rnd.get(0 - random, random) / 100)); + return 1 + ((double) Rnd.get(0 - random, random) / 100); } public final long getAttackEndTime() @@ -6318,7 +6288,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && (Config.L2JMOD_CHAMPION_HP != 0)) { - getStatus().reduceHp((damage / Config.L2JMOD_CHAMPION_HP), attacker, awake, isDOT, false); + getStatus().reduceHp(damage / Config.L2JMOD_CHAMPION_HP, attacker, awake, isDOT, false); } else { @@ -6563,7 +6533,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe { try { - if ((skill == null)) + if (skill == null) { return; } @@ -6828,7 +6798,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return false; } final SkillHolder holder = getInvulAgainstSkills().get(skillId); - return ((holder != null) && ((holder.getSkillLvl() < 1) || (holder.getSkillLvl() == skillLvl))); + return (holder != null) && ((holder.getSkillLvl() < 1) || (holder.getSkillLvl() == skillLvl)); } private Map getInvulAgainstSkills() @@ -6871,8 +6841,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe return globalListeners; } - final Queue both = new LinkedBlockingDeque<>(objectListenres.size() + templateListeners.size() + globalListeners.size()); - both.addAll(objectListenres); + final Queue both = new LinkedBlockingDeque<>(objectListenres); both.addAll(templateListeners); both.addAll(globalListeners); return both; diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index b90c21f25b..b03a9690f9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -246,15 +246,12 @@ public class L2Npc extends L2Character return; } } - else + else if (!_npc.isInActiveRegion()) { - if (!_npc.isInActiveRegion()) - { - return; - } + return; } - if (!(_npc.isDead() || _npc.isStunned() || _npc.isSleeping() || _npc.isParalyzed())) + if (!_npc.isDead() && !_npc.isStunned() && !_npc.isSleeping() && !_npc.isParalyzed()) { _npc.onRandomAnimation(Rnd.get(2, 3)); } @@ -309,7 +306,7 @@ public class L2Npc extends L2Character */ public boolean hasRandomAnimation() { - return ((Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE)); + return (Config.MAX_NPC_ANIMATION > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE); } /** @@ -823,12 +820,9 @@ public class L2Npc extends L2Character return temp; } } - else + else if (HtmCache.getInstance().isLoadable(temp)) { - if (HtmCache.getInstance().isLoadable(temp)) - { - return temp; - } + return temp; } // If the file is not found, the standard message "I have nothing to say to you" is returned @@ -954,7 +948,7 @@ public class L2Npc extends L2Character return; } // Get the text of the selected HTML file in function of the npcId and of the page number - filename = (getHtmlPath(npcId, val)); + filename = getHtmlPath(npcId, val); break; } } @@ -1492,7 +1486,7 @@ public class L2Npc extends L2Character */ public boolean isInMySpawnGroup(L2Npc npc) { - return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName()))); + return (getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && getSpawn().getName().equals(npc.getSpawn().getName()); } /** @@ -1500,7 +1494,7 @@ public class L2Npc extends L2Character */ public boolean staysInSpawnLoc() { - return ((getSpawn() != null) && (getSpawn().getX(this) == getX()) && (getSpawn().getY(this) == getY())); + return (getSpawn() != null) && (getSpawn().getX(this) == getX()) && (getSpawn().getY(this) == getY()); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Playable.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Playable.java index 0e26aa392c..fadee0a7f4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Playable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Playable.java @@ -180,7 +180,7 @@ public abstract class L2Playable extends L2Character { for (QuestState qs : actingPlayer.getNotifyQuestOfDeath()) { - qs.getQuest().notifyDeath((killer == null ? this : killer), this, qs); + qs.getQuest().notifyDeath(killer == null ? this : killer, this, qs); } } // Notify instance diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 1518e14a23..fc63334c9d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -699,13 +699,10 @@ public abstract class L2Summon extends L2Playable return false; } } - else + else if ((!target.canBeAttacked() && !getOwner().getAccessLevel().allowPeaceAttack())// + || (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA) && (skill.getTargetType() != L2TargetType.CLAN) && (skill.getTargetType() != L2TargetType.PARTY) && (skill.getTargetType() != L2TargetType.SELF))) { - if ((!target.canBeAttacked() && !getOwner().getAccessLevel().allowPeaceAttack())// - || (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA) && (skill.getTargetType() != L2TargetType.CLAN) && (skill.getTargetType() != L2TargetType.PARTY) && (skill.getTargetType() != L2TargetType.SELF))) - { - return false; - } + return false; } } // Notify the AI with AI_INTENTION_CAST and target @@ -773,7 +770,7 @@ public abstract class L2Summon extends L2Playable sm.addNpcName(this); sm.addCharName(target); sm.addInt(damage); - sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); + sm.addPopup(target.getObjectId(), getObjectId(), damage * -1); } sendPacket(sm); @@ -912,16 +909,13 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } + else if (isPet()) + { + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); + } else { - if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } - else - { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); - } + activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); } } @@ -970,8 +964,7 @@ public abstract class L2Summon extends L2Playable { final L2PcInstance owner = getOwner(); final L2Object target = getOwner().getTarget(); - if ((owner == null) || (target == null)// - || (Config.FACTION_SYSTEM_ENABLED && target.isPlayer() && ((owner.isGood() && target.getActingPlayer().isGood()) || (owner.isEvil() && target.getActingPlayer().isEvil())))) + if ((owner == null) || (target == null) || (Config.FACTION_SYSTEM_ENABLED && target.isPlayer() && ((owner.isGood() && target.getActingPlayer().isGood()) || (owner.isEvil() && target.getActingPlayer().isEvil())))) { return; } @@ -1063,13 +1056,7 @@ public abstract class L2Summon extends L2Playable return false; } - // Siege golems AI doesn't support attacking other than doors/walls at the moment. - if (target.isDoor() && (getTemplate().getRace() != Race.SIEGE_WEAPON)) - { - return false; - } - - return true; + return !target.isDoor() || (getTemplate().getRace() == Race.SIEGE_WEAPON); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Tower.java b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Tower.java index 448118783d..039d4a31dd 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/L2Tower.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/L2Tower.java @@ -42,14 +42,14 @@ public abstract class L2Tower extends L2Npc public boolean canBeAttacked() { // Attackable during siege by attacker only - return ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress()); + return (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress(); } @Override public boolean isAutoAttackable(L2Character attacker) { // Attackable during siege by attacker only - return ((attacker != null) && attacker.isPlayer() && (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(((L2PcInstance) attacker).getClan())); + return (attacker != null) && attacker.isPlayer() && (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(((L2PcInstance) attacker).getClan()); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java index 110b240216..213d3dd2cb 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java @@ -108,7 +108,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc()); html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_sale2"); - html.replace("%objectId%", String.valueOf((getObjectId()))); + html.replace("%objectId%", String.valueOf(getObjectId())); player.sendPacket(html); } catch (Exception e) @@ -172,7 +172,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf(((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -205,7 +205,7 @@ public final class L2AuctioneerInstance extends L2Npc final int auctionId = Integer.parseInt(val); try { - ClanHallAuctionManager.getInstance().getAuction(auctionId).setBid(player, (st.countTokens() >= 1 ? Math.min(Long.parseLong(st.nextToken()), MAX_ADENA) : 0)); + ClanHallAuctionManager.getInstance().getAuction(auctionId).setBid(player, st.countTokens() >= 1 ? Math.min(Long.parseLong(st.nextToken()), MAX_ADENA) : 0); } catch (Exception e) { @@ -403,7 +403,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf(((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); @@ -434,7 +434,7 @@ public final class L2AuctioneerInstance extends L2Npc html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease())); html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation()); html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate()))); - html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes"); + html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf(((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes"); html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid())); html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size())); html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java index e83fdbfc36..98bba52810 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2BabyPetInstance.java @@ -113,17 +113,14 @@ public final class L2BabyPetInstance extends L2PetInstance _minorHeal = _majorHeal; healPower = skill.getPower(); } + // another heal skill found - search for most powerful + else if (skill.getPower() > healPower) + { + _majorHeal = new SkillHolder(skill); + } else { - // another heal skill found - search for most powerful - if (skill.getPower() > healPower) - { - _majorHeal = new SkillHolder(skill); - } - else - { - _minorHeal = new SkillHolder(skill); - } + _minorHeal = new SkillHolder(skill); } continue; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java index 9076e4321d..ee67743118 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java @@ -130,19 +130,16 @@ public class L2ClanHallDoormenInstance extends L2DoormenInstance html.setFile(player.getHtmlPrefix(), _hasEvolve ? "html/clanHallDoormen/doormen2.htm" : "html/clanHallDoormen/doormen1.htm"); html.replace("%clanname%", owner.getName()); } + else if ((owner != null) && (owner.getLeader() != null)) + { + html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen-no.htm"); + html.replace("%leadername%", owner.getLeaderName()); + html.replace("%clanname%", owner.getName()); + } else { - if ((owner != null) && (owner.getLeader() != null)) - { - html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/doormen-no.htm"); - html.replace("%leadername%", owner.getLeaderName()); - html.replace("%clanname%", owner.getName()); - } - else - { - html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/emptyowner.htm"); - html.replace("%hallname%", getClanHall().getName()); - } + html.setFile(player.getHtmlPrefix(), "html/clanHallDoormen/emptyowner.htm"); + html.replace("%hallname%", getClanHall().getName()); } html.replace("%objectId%", String.valueOf(getObjectId())); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java index e7ad463ad6..4db31271e8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java @@ -161,13 +161,13 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (val.equalsIgnoreCase("tele")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null) + if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null) { - html.setFile(player.getHtmlPrefix(), "html/clanHallManager/chamberlain-nac.htm"); + html.setFile(player.getHtmlPrefix(), "html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm"); } else { - html.setFile(player.getHtmlPrefix(), "html/clanHallManager/tele" + getClanHall().getLocation() + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + ".htm"); + html.setFile(player.getHtmlPrefix(), "html/clanHallManager/chamberlain-nac.htm"); } sendHtmlMessage(player, html); } @@ -184,7 +184,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance { return; } - showBuyWindow(player, (Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() * 100000))); + showBuyWindow(player, Integer.parseInt(st.nextToken()) + (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() * 100000)); } else if (val.equalsIgnoreCase("support")) { @@ -523,7 +523,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_HP, percent, fee, Config.CH_HPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_HP, percent, fee, Config.CH_HPREG_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -590,7 +590,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_MP, percent, fee, Config.CH_MPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_MP, percent, fee, Config.CH_MPREG_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -667,7 +667,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_EXP, percent, fee, Config.CH_EXPREG_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_RESTORE_EXP, percent, fee, Config.CH_EXPREG_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1064,7 +1064,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_ITEM_CREATE, lvl, fee, Config.CH_ITEM_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1116,7 +1116,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_TELEPORT, lvl, fee, Config.CH_TELE_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_TELEPORT) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1198,7 +1198,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_SUPPORT, lvl, fee, Config.CH_SUPPORT_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_SUPPORT) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1421,7 +1421,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_CURTAINS, lvl, fee, Config.CH_CURTAIN_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1473,7 +1473,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance break; } } - if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null))) + if (!getClanHall().updateFunctions(player, ClanHall.FUNC_DECO_FRONTPLATEFORM, lvl, fee, Config.CH_FRONT_FEE_RATIO, getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) == null)) { html.setFile(player.getHtmlPrefix(), "html/clanHallManager/low_adena.htm"); sendHtmlMessage(player, html); @@ -1602,7 +1602,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance if (actualCommand.equalsIgnoreCase("list_back")) { final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - final String file = !HtmCache.getInstance().isLoadable(("html/clanHallManager/chamberlain-" + getId() + ".htm")) ? "html/clanHallManager/chamberlain.htm" : "html/clanHallManager/chamberlain-" + getId() + ".htm"; + final String file = !HtmCache.getInstance().isLoadable("html/clanHallManager/chamberlain-" + getId() + ".htm") ? "html/clanHallManager/chamberlain.htm" : "html/clanHallManager/chamberlain-" + getId() + ".htm"; html.setFile(player.getHtmlPrefix(), file); html.replace("%objectId%", String.valueOf(getObjectId())); html.replace("%npcname%", getName()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java index c77c9bc029..72b0676766 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -129,7 +129,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance } } - public static final void onTutorialLink(L2PcInstance player, String request) + public static void onTutorialLink(L2PcInstance player, String request) { if (!Config.ALTERNATE_CLASS_MASTER || (request == null) || !request.startsWith("AlternateClassMaster")) { @@ -152,7 +152,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(TutorialCloseHtml.STATIC_PACKET); } - public static final void onTutorialQuestionMark(L2PcInstance player, int number) + public static void onTutorialQuestionMark(L2PcInstance player, int number) { if (!Config.ALTERNATE_CLASS_MASTER || (number != 1001)) { @@ -162,7 +162,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance showTutorialHtml(player); } - public static final void showQuestionMark(L2PcInstance player) + public static void showQuestionMark(L2PcInstance player) { if (!Config.ALTERNATE_CLASS_MASTER) { @@ -178,7 +178,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(new TutorialShowQuestionMark(1001)); } - private static final void showHtmlMenu(L2PcInstance player, int objectId, int level) + private static void showHtmlMenu(L2PcInstance player, int objectId, int level) { final NpcHtmlMessage html = new NpcHtmlMessage(objectId); @@ -311,17 +311,14 @@ public final class L2ClassMasterInstance extends L2MerchantInstance html.replace("%level%", String.valueOf(getMinLevel(level - 1, player))); } } + else if (minLevel < Integer.MAX_VALUE) + { + html.setFile(player.getHtmlPrefix(), "html/classmaster/comebacklater.htm"); + html.replace("%level%", String.valueOf(minLevel)); + } else { - if (minLevel < Integer.MAX_VALUE) - { - html.setFile(player.getHtmlPrefix(), "html/classmaster/comebacklater.htm"); - html.replace("%level%", String.valueOf(minLevel)); - } - else - { - html.setFile(player.getHtmlPrefix(), "html/classmaster/nomore.htm"); - } + html.setFile(player.getHtmlPrefix(), "html/classmaster/nomore.htm"); } } } @@ -331,7 +328,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(html); } - private static final void showTutorialHtml(L2PcInstance player) + private static void showTutorialHtml(L2PcInstance player) { final ClassId currentClassId = player.getClassId(); if ((getMinLevel(currentClassId.level(), player) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE) @@ -358,7 +355,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance player.sendPacket(new NpcHtmlMessage(msg)); } - private static final boolean checkAndChangeClass(L2PcInstance player, int val) + private static boolean checkAndChangeClass(L2PcInstance player, int val) { final ClassId currentClassId = player.getClassId(); if (((getMinLevel(currentClassId.level(), player) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE) || !validateClassId(currentClassId, val)) @@ -432,7 +429,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param player L2PcInstance * @return minimum player level required for next class transfer */ - private static final int getMinLevel(int level, L2PcInstance player) + private static int getMinLevel(int level, L2PcInstance player) { if (player.getRace() == Race.ERTHEIA) { @@ -487,7 +484,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param val new class index * @return */ - private static final boolean validateClassId(ClassId oldCID, int val) + private static boolean validateClassId(ClassId oldCID, int val) { return validateClassId(oldCID, ClassId.getClassId(val)); } @@ -498,7 +495,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance * @param newCID new ClassId * @return true if class change is possible */ - private static final boolean validateClassId(ClassId oldCID, ClassId newCID) + private static boolean validateClassId(ClassId oldCID, ClassId newCID) { if ((newCID == null) || (newCID.getRace() == null)) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableAirShipInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableAirShipInstance.java index b53f1848c1..8bc79b496d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableAirShipInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ControllableAirShipInstance.java @@ -76,12 +76,7 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance @Override public boolean isOwner(L2PcInstance player) { - if (_ownerId == 0) - { - return false; - } - - return (player.getClanId() == _ownerId) || (player.getObjectId() == _ownerId); + return (_ownerId != 0) && ((player.getClanId() == _ownerId) || (player.getObjectId() == _ownerId)); } @Override @@ -121,76 +116,73 @@ public class L2ControllableAirShipInstance extends L2AirShipInstance { _captain = null; } - else + else if ((_captain == null) && (player.getAirShip() == this)) { - if ((_captain == null) && (player.getAirShip() == this)) - { - final int x = player.getInVehiclePosition().getX() - 0x16e; - final int y = player.getInVehiclePosition().getY(); - final int z = player.getInVehiclePosition().getZ() - 0x6b; - if (((x * x) + (y * y) + (z * z)) > 2500) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_BECAUSE_YOU_ARE_TOO_FAR); - return false; - } - // TODO: Missing message ID: 2739 Message: You cannot control the helm because you do not meet the requirements. - else if (player.isInCombat()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_BATTLE); - return false; - } - else if (player.isSitting()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_SITTING_POSITION); - return false; - } - else if (player.isParalyzed()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_YOU_ARE_PETRIFIED); - return false; - } - else if (player.isCursedWeaponEquipped()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_A_CURSED_WEAPON_IS_EQUIPPED); - return false; - } - else if (player.isFishing()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_FISHING); - return false; - } - else if (player.isDead() || player.isFakeDeath()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHEN_YOU_ARE_DEAD); - return false; - } - else if (player.isCastingNow()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_USING_A_SKILL); - return false; - } - else if (player.isTransformed()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_TRANSFORMED); - return false; - } - else if (player.isCombatFlagEquipped()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_HOLDING_A_FLAG); - return false; - } - else if (player.isInDuel()) - { - player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_DUEL); - return false; - } - _captain = player; - player.broadcastUserInfo(); - } - else + final int x = player.getInVehiclePosition().getX() - 0x16e; + final int y = player.getInVehiclePosition().getY(); + final int z = player.getInVehiclePosition().getZ() - 0x6b; + if (((x * x) + (y * y) + (z * z)) > 2500) { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_BECAUSE_YOU_ARE_TOO_FAR); return false; } + // TODO: Missing message ID: 2739 Message: You cannot control the helm because you do not meet the requirements. + else if (player.isInCombat()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_BATTLE); + return false; + } + else if (player.isSitting()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_SITTING_POSITION); + return false; + } + else if (player.isParalyzed()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_YOU_ARE_PETRIFIED); + return false; + } + else if (player.isCursedWeaponEquipped()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_A_CURSED_WEAPON_IS_EQUIPPED); + return false; + } + else if (player.isFishing()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_FISHING); + return false; + } + else if (player.isDead() || player.isFakeDeath()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHEN_YOU_ARE_DEAD); + return false; + } + else if (player.isCastingNow()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_USING_A_SKILL); + return false; + } + else if (player.isTransformed()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_TRANSFORMED); + return false; + } + else if (player.isCombatFlagEquipped()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_HOLDING_A_FLAG); + return false; + } + else if (player.isInDuel()) + { + player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_DUEL); + return false; + } + _captain = player; + player.broadcastUserInfo(); + } + else + { + return false; } updateAbnormalVisualEffects(); return true; diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java index 517ba11350..cbbab22e22 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2CubicInstance.java @@ -377,7 +377,7 @@ public final class L2CubicInstance implements IIdentifiable if (ownerTarget.getActingPlayer() != null) { final L2PcInstance target = ownerTarget.getActingPlayer(); - if (enemyTeam.containsPlayer(target.getObjectId()) && !(target.isDead())) + if (enemyTeam.containsPlayer(target.getObjectId()) && !target.isDead()) { _target = (L2Character) ownerTarget; } @@ -414,24 +414,21 @@ public final class L2CubicInstance implements IIdentifiable partyEnemy = partyA; } } - else + else if (PlayerA == _owner) { - if (PlayerA == _owner) + if (partyB != null) { - if (partyB != null) - { - partyEnemy = partyB; - } - else - { - _target = PlayerB; - } + partyEnemy = partyB; } else { - _target = PlayerA; + _target = PlayerB; } } + else + { + _target = PlayerA; + } if (((_target == PlayerA) || (_target == PlayerB)) && (_target == ownerTarget)) { return; @@ -682,9 +679,9 @@ public final class L2CubicInstance implements IIdentifiable } // TODO: Unhardcode fixed value - final double hpAdd = (0.4 * damage); + final double hpAdd = 0.4 * damage; final L2PcInstance owner = _owner; - final double hp = ((owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd)); + final double hp = (owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd); owner.setCurrentHp(hp); @@ -738,12 +735,9 @@ public final class L2CubicInstance implements IIdentifiable _log.info("Disablers: useCubicSkill() -> success"); } } - else + else if (Config.DEBUG) { - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> failed"); - } + _log.info("Disablers: useCubicSkill() -> failed"); } } @@ -764,12 +758,9 @@ public final class L2CubicInstance implements IIdentifiable _log.info("Disablers: useCubicSkill() -> success"); } } - else + else if (Config.DEBUG) { - if (Config.DEBUG) - { - _log.info("Disablers: useCubicSkill() -> failed"); - } + _log.info("Disablers: useCubicSkill() -> failed"); } } } @@ -791,11 +782,11 @@ public final class L2CubicInstance implements IIdentifiable // temporary range check until real behavior of cubics is known/coded final int range = MAX_MAGIC_RANGE; - x = (owner.getX() - target.getX()); - y = (owner.getY() - target.getY()); - z = (owner.getZ() - target.getZ()); + x = owner.getX() - target.getX(); + y = owner.getY() - target.getY(); + z = owner.getZ() - target.getZ(); - return (((x * x) + (y * y) + (z * z)) <= (range * range)); + return ((x * x) + (y * y) + (z * z)) <= (range * range); } /** this sets the friendly target for a cubic */ @@ -815,7 +806,7 @@ public final class L2CubicInstance implements IIdentifiable { if (!partyMember.isDead() && isInCubicRange(_owner, partyMember) && (partyMember.getCurrentHp() < partyMember.getMaxHp()) && (percentleft > (partyMember.getCurrentHp() / partyMember.getMaxHp()))) { - percentleft = (partyMember.getCurrentHp() / partyMember.getMaxHp()); + percentleft = partyMember.getCurrentHp() / partyMember.getMaxHp(); target = partyMember; } final L2Summon pet = partyMember.getPet(); @@ -830,7 +821,7 @@ public final class L2CubicInstance implements IIdentifiable // the lowest HP if ((pet.getCurrentHp() < pet.getMaxHp()) && (percentleft > (pet.getCurrentHp() / pet.getMaxHp()))) { - percentleft = (pet.getCurrentHp() / pet.getMaxHp()); + percentleft = pet.getCurrentHp() / pet.getMaxHp(); target = pet; } } @@ -845,7 +836,7 @@ public final class L2CubicInstance implements IIdentifiable // the lowest HP if ((s.getCurrentHp() < s.getMaxHp()) && (percentleft > (s.getCurrentHp() / s.getMaxHp()))) { - percentleft = (s.getCurrentHp() / s.getMaxHp()); + percentleft = s.getCurrentHp() / s.getMaxHp(); target = s; } } @@ -855,7 +846,7 @@ public final class L2CubicInstance implements IIdentifiable { if (_owner.getCurrentHp() < _owner.getMaxHp()) { - percentleft = (_owner.getCurrentHp() / _owner.getMaxHp()); + percentleft = _owner.getCurrentHp() / _owner.getMaxHp(); target = _owner; } for (L2Summon summon : _owner.getServitors().values()) diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java index e955d2bffc..ced0b0472c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DefenderInstance.java @@ -95,10 +95,10 @@ public class L2DefenderInstance extends L2Attackable // Check if siege is in progress if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) { - final int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); + final int activeSiegeId = _fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0)); // Check if player is an enemy of this defender npc - if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1)) || (player.getSiegeState() == 0))) + if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || (player.getSiegeState() == 1) || (player.getSiegeState() == 0))) { return true; } @@ -203,7 +203,7 @@ public class L2DefenderInstance extends L2Attackable // Check if siege is in progress if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) { - final int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0))); + final int activeSiegeId = _fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0)); if ((player != null) && (player.getSiegeState() == 2) && player.isRegisteredOnThisSiegeField(activeSiegeId)) { return; diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java index 625cccff8f..eff6764fb0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java @@ -319,13 +319,9 @@ public class L2DoorInstance extends L2Character public boolean isEnemy() { - if (((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive() && getIsShowHp())// + return ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive() && getIsShowHp())// || ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive() && getIsShowHp())// - || ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).getSiegeZone().isActive() && getIsShowHp())) - { - return true; - } - return false; + || ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).getSiegeZone().isActive() && getIsShowHp()); } @Override @@ -351,15 +347,11 @@ public class L2DoorInstance extends L2Character if (getClanHall() != null) { final SiegableHall hall = (SiegableHall) getClanHall(); - if (!hall.isSiegableHall()) - { - return false; - } - return hall.isInSiege() && hall.getSiege().doorIsAutoAttackable() && hall.getSiege().checkIsAttacker(actingPlayer.getClan()); + return hall.isSiegableHall() && hall.isInSiege() && hall.getSiege().doorIsAutoAttackable() && hall.getSiege().checkIsAttacker(actingPlayer.getClan()); } // Attackable only during siege by everyone (not owner) - final boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive()); - final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive()); + final boolean isCastle = (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive(); + final boolean isFort = (getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive(); if (isFort) { @@ -377,7 +369,7 @@ public class L2DoorInstance extends L2Character return false; } } - return (isCastle || isFort); + return isCastle || isFort; } @Override @@ -432,7 +424,7 @@ public class L2DoorInstance extends L2Character continue; } - if (player.isGM() || (((getCastle() != null) && (getCastle().getResidenceId() > 0)) || ((getFort() != null) && (getFort().getResidenceId() > 0)))) + if (player.isGM() || ((getCastle() != null) && (getCastle().getResidenceId() > 0)) || ((getFort() != null) && (getFort().getResidenceId() > 0))) { player.sendPacket(targetableSu); } @@ -623,9 +615,9 @@ public class L2DoorInstance extends L2Character return false; } - final boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress()); - final boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress()); - final boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege()); + final boolean isFort = (getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress(); + final boolean isCastle = (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress(); + final boolean isHall = (getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege(); if (isFort || isCastle || isHall) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java index 675e6fce21..0bc202e6ed 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortCommanderInstance.java @@ -53,13 +53,7 @@ public class L2FortCommanderInstance extends L2DefenderInstance @Override public boolean isAutoAttackable(L2Character attacker) { - if ((attacker == null) || !(attacker instanceof L2PcInstance)) - { - return false; - } - - // Attackable during siege by all except defenders - return ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan())); + return (attacker instanceof L2PcInstance) && (getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(((L2PcInstance) attacker).getClan()); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java index 170fea1f8e..291c097a30 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java @@ -103,49 +103,34 @@ public class L2FortManagerInstance extends L2MerchantInstance } if (actualCommand.equalsIgnoreCase("banish_foreigner")) { + final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); if (player.hasClanPrivilege(ClanPrivilege.CS_DISMISS)) { getFort().banishForeigners(); // Move non-clan members off fortress area - final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-expeled.htm"); - html.replace("%objectId%", String.valueOf(getObjectId())); - player.sendPacket(html); } else { - final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-noprivs.htm"); - html.replace("%objectId%", String.valueOf(getObjectId())); - player.sendPacket(html); } + html.replace("%objectId%", String.valueOf(getObjectId())); + player.sendPacket(html); return; } if (actualCommand.equalsIgnoreCase("receive_report")) { + final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); if (getFort().getFortState() < 2) { - final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-report.htm"); html.replace("%objectId%", String.valueOf(getObjectId())); - if (Config.FS_MAX_OWN_TIME > 0) - { - final int hour = (int) Math.floor(getFort().getTimeTillRebelArmy() / 3600); - final int minutes = (int) (Math.floor(getFort().getTimeTillRebelArmy() - (hour * 3600)) / 60); - html.replace("%hr%", String.valueOf(hour)); - html.replace("%min%", String.valueOf(minutes)); - } - else - { - final int hour = (int) Math.floor(getFort().getOwnedTime() / 3600); - final int minutes = (int) (Math.floor(getFort().getOwnedTime() - (hour * 3600)) / 60); - html.replace("%hr%", String.valueOf(hour)); - html.replace("%min%", String.valueOf(minutes)); - } - player.sendPacket(html); + final int hour = Config.FS_MAX_OWN_TIME > 0 ? (int) Math.floor(getFort().getTimeTillRebelArmy() / 3600) : (int) Math.floor(getFort().getOwnedTime() / 3600); + final int minutes = Config.FS_MAX_OWN_TIME > 0 ? (int) (Math.floor(getFort().getTimeTillRebelArmy() - (hour * 3600)) / 60) : (int) (Math.floor(getFort().getOwnedTime() - (hour * 3600)) / 60); + html.replace("%hr%", String.valueOf(hour)); + html.replace("%min%", String.valueOf(minutes)); } else { - final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); html.setFile(player.getHtmlPrefix(), "html/fortress/foreman-castlereport.htm"); html.replace("%objectId%", String.valueOf(getObjectId())); int hour, minutes; @@ -166,8 +151,8 @@ public class L2FortManagerInstance extends L2MerchantInstance html.replace("%castle%", getFort().getContractedCastle().getName()); html.replace("%hr2%", String.valueOf(hour)); html.replace("%min2%", String.valueOf(minutes)); - player.sendPacket(html); } + player.sendPacket(html); return; } if (actualCommand.equalsIgnoreCase("operate_door")) @@ -176,7 +161,7 @@ public class L2FortManagerInstance extends L2MerchantInstance { if (!val.isEmpty()) { - final boolean open = (Integer.parseInt(val) == 1); + final boolean open = Integer.parseInt(val) == 1; while (st.hasMoreTokens()) { getFort().openCloseDoor(player, Integer.parseInt(st.nextToken()), open); @@ -457,7 +442,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_HP) == null))) + if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_HP, percent, fee, Config.FS_HPREG_FEE_RATIO, getFort().getFunction(Fort.FUNC_RESTORE_HP) == null)) { html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm"); sendHtmlMessage(player, html); @@ -505,7 +490,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_MP) == null))) + if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_MP, percent, fee, Config.FS_MPREG_FEE_RATIO, getFort().getFunction(Fort.FUNC_RESTORE_MP) == null)) { html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm"); sendHtmlMessage(player, html); @@ -553,7 +538,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, (getFort().getFunction(Fort.FUNC_RESTORE_EXP) == null))) + if (!getFort().updateFunctions(player, Fort.FUNC_RESTORE_EXP, percent, fee, Config.FS_EXPREG_FEE_RATIO, getFort().getFunction(Fort.FUNC_RESTORE_EXP) == null)) { html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm"); sendHtmlMessage(player, html); @@ -725,7 +710,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, (getFort().getFunction(Fort.FUNC_TELEPORT) == null))) + if (!getFort().updateFunctions(player, Fort.FUNC_TELEPORT, lvl, fee, Config.FS_TELE_FEE_RATIO, getFort().getFunction(Fort.FUNC_TELEPORT) == null)) { html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm"); sendHtmlMessage(player, html); @@ -773,7 +758,7 @@ public class L2FortManagerInstance extends L2MerchantInstance break; } } - if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, (getFort().getFunction(Fort.FUNC_SUPPORT) == null))) + if (!getFort().updateFunctions(player, Fort.FUNC_SUPPORT, lvl, fee, Config.FS_SUPPORT_FEE_RATIO, getFort().getFunction(Fort.FUNC_SUPPORT) == null)) { html.setFile(player.getHtmlPrefix(), "html/fortress/low_adena.htm"); } @@ -864,7 +849,7 @@ public class L2FortManagerInstance extends L2MerchantInstance sendHtmlMessage(player, html); return; } - this.doCast(skill); + doCast(skill); } html.setFile(player.getHtmlPrefix(), "html/fortress/support-done.htm"); html.replace("%mp%", String.valueOf((int) getCurrentMp())); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FriendlyMobInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FriendlyMobInstance.java index 30f62a0d7a..92c66be17d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FriendlyMobInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2FriendlyMobInstance.java @@ -53,11 +53,7 @@ public class L2FriendlyMobInstance extends L2Attackable @Override public boolean isAutoAttackable(L2Character attacker) { - if (attacker instanceof L2PcInstance) - { - return ((L2PcInstance) attacker).getReputation() < 0; - } - return false; + return (attacker instanceof L2PcInstance) && (((L2PcInstance) attacker).getReputation() < 0); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java index c57cb017f8..c4f2e580a4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GrandBossInstance.java @@ -84,7 +84,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance { for (L2PcInstance member : player.getParty().getMembers()) { - member.setRaidPoints(member.getRaidPoints() + ((getLevel() / 2) + Rnd.get(-5, 5))); + member.setRaidPoints(member.getRaidPoints() + (getLevel() / 2) + Rnd.get(-5, 5)); if (member.isNoble()) { Hero.getInstance().setRBkilled(member.getObjectId(), getId()); @@ -93,7 +93,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance } else { - player.setRaidPoints(player.getRaidPoints() + ((getLevel() / 2) + Rnd.get(-5, 5))); + player.setRaidPoints(player.getRaidPoints() + (getLevel() / 2) + Rnd.get(-5, 5)); if (player.isNoble()) { Hero.getInstance().setRBkilled(player.getObjectId(), getId()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index b5791aa693..69fd6bd87f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -87,7 +87,7 @@ public class L2GuardInstance extends L2Attackable // check the region where this mob is, do not activate the AI if region is inactive. final L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY()); - if ((region != null) && (!region.isActive())) + if ((region != null) && !region.isActive()) { getAI().stopAITask(); } @@ -163,36 +163,33 @@ public class L2GuardInstance extends L2Attackable // Set the L2PcInstance Intention to AI_INTENTION_ATTACK player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this); } + // Calculate the distance between the L2PcInstance and the L2NpcInstance + else if (!canInteract(player)) + { + // Set the L2PcInstance Intention to AI_INTENTION_INTERACT + player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, this); + } else { - // Calculate the distance between the L2PcInstance and the L2NpcInstance - if (!canInteract(player)) + // Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance + // to display a social action of the L2GuardInstance on their client + broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8))); + + player.setLastFolkNPC(this); + + // Open a chat window on client with the text of the L2GuardInstance + if (hasListener(EventType.ON_NPC_QUEST_START)) { - // Set the L2PcInstance Intention to AI_INTENTION_INTERACT - player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, this); + player.setLastQuestNpcObject(getObjectId()); + } + + if (hasListener(EventType.ON_NPC_FIRST_TALK)) + { + EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(this, player), this); } else { - // Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance - // to display a social action of the L2GuardInstance on their client - broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8))); - - player.setLastFolkNPC(this); - - // Open a chat window on client with the text of the L2GuardInstance - if (hasListener(EventType.ON_NPC_QUEST_START)) - { - player.setLastQuestNpcObject(getObjectId()); - } - - if (hasListener(EventType.ON_NPC_FIRST_TALK)) - { - EventDispatcher.getInstance().notifyEventAsync(new OnNpcFirstTalk(this, player), this); - } - else - { - showChatWindow(player, 0); - } + showChatWindow(player, 0); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 88d2cf5a95..4e411c855d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -87,7 +87,7 @@ public class L2MerchantInstance extends L2NpcInstance return; } - final double taxRate = (applyTax) ? getMpc().getTotalTaxRate() : 0; + final double taxRate = applyTax ? getMpc().getTotalTaxRate() : 0; player.setInventoryBlockingStatus(true); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java index 93e8b9d9ac..f10d7f40d8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java @@ -214,7 +214,7 @@ public class L2MonsterInstance extends L2Attackable @Override public boolean isWalker() { - return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker()); + return (getLeader() == null) ? super.isWalker() : getLeader().isWalker(); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java index 3ab8507548..64d2d3ab65 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2NpcInstance.java @@ -132,18 +132,15 @@ public class L2NpcInstance extends L2Npc sm.addInt(minLevel); player.sendPacket(sm); } + else if (player.getClassId().level() == 1) + { + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE); + sm.addInt(2); + player.sendPacket(sm); + } else { - if (player.getClassId().level() == 1) - { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN_PLEASE_COME_BACK_AFTER_S1ND_CLASS_CHANGE); - sm.addInt(2); - player.sendPacket(sm); - } - else - { - player.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN); - } + player.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN); } } else diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java index 854cacb359..e666d94eb2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ObservationInstance.java @@ -53,16 +53,13 @@ public final class L2ObservationInstance extends L2Npc filename = "html/observation/" + getId() + "-Oracle-" + val + ".htm"; } } + else if (val == 0) + { + filename = "html/observation/" + getId() + ".htm"; + } else { - if (val == 0) - { - filename = "html/observation/" + getId() + ".htm"; - } - else - { - filename = "html/observation/" + getId() + "-" + val + ".htm"; - } + filename = "html/observation/" + getId() + "-" + val + ".htm"; } final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 4d0f208177..6bdf8151be 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -750,7 +750,7 @@ public final class L2PcInstance extends L2Playable private int _fishx = 0; private int _fishy = 0; private int _fishz = 0; - private final static SkillHolder FISHING_SKILL = new SkillHolder(1312, 1); + private static final SkillHolder FISHING_SKILL = new SkillHolder(1312, 1); private ScheduledFuture _taskRentPet; private ScheduledFuture _taskWater; @@ -1495,7 +1495,7 @@ public final class L2PcInstance extends L2Playable final List quests = new LinkedList<>(); for (QuestState qs : _quests.values()) { - if ((qs == null) || (qs.getQuest() == null) || (!qs.isCompleted())) + if ((qs == null) || (qs.getQuest() == null) || !qs.isCompleted()) { continue; } @@ -1528,7 +1528,7 @@ public final class L2PcInstance extends L2Playable final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject()); if (object.isNpc() && isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false)) { - quest.notifyEvent(event, ((L2Npc) object), this); + quest.notifyEvent(event, (L2Npc) object, this); } } } @@ -1702,7 +1702,7 @@ public final class L2PcInstance extends L2Playable public boolean isRegisteredOnThisSiegeField(int val) { - return ((_siegeSide == val) || ((_siegeSide >= 81) && (_siegeSide <= 89))); + return (_siegeSide == val) || ((_siegeSide >= 81) && (_siegeSide <= 89)); } @Override @@ -1815,7 +1815,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.ALTEREDZONE; - sendPacket((new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE))); + sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTEREDZONE)); } else if (isInsideZone(ZoneId.SIEGE)) { @@ -1824,7 +1824,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.SIEGEWARZONE2; - sendPacket((new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2))); + sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGEWARZONE2)); } else if (isInsideZone(ZoneId.PVP)) { @@ -1833,7 +1833,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.PVPZONE; - sendPacket((new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE))); + sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PVPZONE)); } else if (isInsideZone(ZoneId.PEACE)) { @@ -1842,7 +1842,7 @@ public final class L2PcInstance extends L2Playable return; } _lastCompassZone = ExSetCompassZoneCode.PEACEZONE; - sendPacket((new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE))); + sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACEZONE)); } else { @@ -1855,7 +1855,7 @@ public final class L2PcInstance extends L2Playable updatePvPStatus(); } _lastCompassZone = ExSetCompassZoneCode.GENERALZONE; - sendPacket((new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE))); + sendPacket(new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERALZONE)); } } @@ -2082,7 +2082,7 @@ public final class L2PcInstance extends L2Playable final int maxLoad = getMaxLoad(); if (maxLoad > 0) { - final long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / getMaxLoad()); + final long weightproc = ((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / getMaxLoad(); int newWeightPenalty; if ((weightproc < 500) || _dietMode) { @@ -2139,7 +2139,7 @@ public final class L2PcInstance extends L2Playable for (L2ItemInstance item : getInventory().getItems()) { - if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT))) + if ((item != null) && item.isEquipped() && (item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) { crystaltype = item.getItem().getCrystalType().getId(); if (crystaltype > expertiseLevel) @@ -2215,13 +2215,12 @@ public final class L2PcInstance extends L2Playable { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(item.getEnchantLevel()); - sm.addItemName(item); } else { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(item); } + sm.addItemName(item); sendPacket(sm); final int slot = getInventory().getSlotFromItem(item); @@ -2245,13 +2244,12 @@ public final class L2PcInstance extends L2Playable { sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPPED_S1_S2); sm.addInt(item.getEnchantLevel()); - sm.addItemName(item); } else { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EQUIPPED_YOUR_S1); - sm.addItemName(item); } + sm.addItemName(item); sendPacket(sm); // Consume mana - will start a task if required; returns if item is not a shadow item @@ -2376,7 +2374,7 @@ public final class L2PcInstance extends L2Playable } else { - _clan.addReputationScore((Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20)), true); + _clan.addReputationScore(Config.JOIN_ACADEMY_MAX_REP_SCORE - ((getLvlJoinedAcademy() - 16) * 20), true); } setLvlJoinedAcademy(0); // oust pledge member from the academy, cuz he has finished his 2nd class transfer @@ -3379,13 +3377,13 @@ public final class L2PcInstance extends L2Playable } // Auto-use herbs. final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null); - if (handler == null) + if (handler != null) { - _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); + handler.useItem(this, new L2ItemInstance(itemId), false); } else { - handler.useItem(this, new L2ItemInstance(itemId), false); + _log.warning("No item handler registered for Herb ID " + item.getId() + "!"); } } return null; @@ -4029,12 +4027,9 @@ public final class L2PcInstance extends L2Playable { _client.cleanMe(true); } - else + else if (!_client.getConnection().isClosed()) { - if (!_client.getConnection().isClosed()) - { - _client.close(closeClient ? LeaveWorld.STATIC_PACKET : ServerClose.STATIC_PACKET); - } + _client.close(closeClient ? LeaveWorld.STATIC_PACKET : ServerClose.STATIC_PACKET); } } } @@ -4071,7 +4066,7 @@ public final class L2PcInstance extends L2Playable } // Check if the spell using charges or not in AirShip - if (((getCharges() < skill.getChargeConsume())) || (isInAirShip() && !skill.hasEffectType(L2EffectType.REFUEL_AIRSHIP))) + if ((getCharges() < skill.getChargeConsume()) || (isInAirShip() && !skill.hasEffectType(L2EffectType.REFUEL_AIRSHIP))) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); sm.addSkillName(skill); @@ -4424,13 +4419,10 @@ public final class L2PcInstance extends L2Playable sendPacket(new RecipeShopSellList(this, temp)); } } - else + // _interactTarget=null should never happen but one never knows ^^; + else if (target != null) { - // _interactTarget=null should never happen but one never knows ^^; - if (target != null) - { - target.onAction(this); - } + target.onAction(this); } } @@ -4495,7 +4487,7 @@ public final class L2PcInstance extends L2Playable getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); // Check if the L2Object to pick up is a L2ItemInstance - if (!(object.isItem())) + if (!object.isItem()) { // dont try to pickup anything that is not an item :) _log.warning(this + " trying to pickup wrong target." + getTarget()); @@ -4584,13 +4576,13 @@ public final class L2PcInstance extends L2Playable if (target.getItem().hasExImmediateEffect()) { final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); - if (handler == null) + if (handler != null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + handler.useItem(this, target, false); } else { - handler.useItem(this, target, false); + _log.warning("No item handler registered for item ID: " + target.getId() + "."); } ItemTable.getInstance().destroyItem("Consume", target, this, null); } @@ -4697,7 +4689,7 @@ public final class L2PcInstance extends L2Playable @Override public int getMinShopDistance() { - return (isSitting()) ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; + return isSitting() ? Config.SHOP_MIN_RANGE_FROM_PLAYER : 0; } public void tryOpenPrivateBuyStore() @@ -4854,12 +4846,12 @@ public final class L2PcInstance extends L2Playable */ public int getTransformationId() { - return (isTransformed() ? getTransformation().getId() : 0); + return isTransformed() ? getTransformation().getId() : 0; } public int getTransformationDisplayId() { - return (isTransformed() ? getTransformation().getDisplayId() : 0); + return isTransformed() ? getTransformation().getDisplayId() : 0; } /** @@ -4876,7 +4868,7 @@ public final class L2PcInstance extends L2Playable { if (newTarget != null) { - final boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer())); + final boolean isInParty = newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer()); // Prevents /target exploiting if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) @@ -5253,7 +5245,7 @@ public final class L2PcInstance extends L2Playable if (!insidePvpZone && !insideSiegeZone) { - if ((pk != null) && (pk.getClan() != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) + if ((pk != null) && (pk.getClan() != null) && (getClan() != null) && !isAcademyMember() && !pk.isAcademyMember()) { if ((_clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getId())) || (isInSiege() && pk.isInSiege())) { @@ -5350,7 +5342,7 @@ public final class L2PcInstance extends L2Playable if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || Config.KARMA_DROP_GM)) { boolean isKarmaDrop = false; - final boolean isKillerNpc = (killer instanceof L2Npc); + final boolean isKillerNpc = killer instanceof L2Npc; final int pkLimit = Config.KARMA_PK_LIMIT; int dropEquip = 0; @@ -5611,7 +5603,7 @@ public final class L2PcInstance extends L2Playable return; } - if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) + if (isInDuel() && (player_target.getDuelId() == getDuelId())) { return; } @@ -5918,7 +5910,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isRequestExpired() { - return !(_requestExpireTime > GameTimeController.getInstance().getGameTicks()); + return _requestExpireTime <= GameTimeController.getInstance().getGameTicks(); } /** @@ -6440,13 +6432,12 @@ public final class L2PcInstance extends L2Playable { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(unequiped[0].getEnchantLevel()); - sm.addItemName(unequiped[0]); } else { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(unequiped[0]); } + sm.addItemName(unequiped[0]); sendPacket(sm); } } @@ -7895,7 +7886,7 @@ public final class L2PcInstance extends L2Playable { for (Shortcut sc : getAllShortCuts()) { - if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) + if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && ((skill.getId() < 3080) || (skill.getId() > 3259))) { deleteShortCut(sc.getSlot(), sc.getPage()); } @@ -8392,19 +8383,16 @@ public final class L2PcInstance extends L2Playable _hennaCHA += h.getStatCHA(); } } - else + else if (h.getDyeId() <= 180) { - if (h.getDyeId() <= 180) - { - _hennaINT += ((_hennaINT + h.getStatINT()) > 5) ? 5 - _hennaINT : h.getStatINT(); - _hennaSTR += ((_hennaSTR + h.getStatSTR()) > 5) ? 5 - _hennaSTR : h.getStatSTR(); - _hennaMEN += ((_hennaMEN + h.getStatMEN()) > 5) ? 5 - _hennaMEN : h.getStatMEN(); - _hennaCON += ((_hennaCON + h.getStatCON()) > 5) ? 5 - _hennaCON : h.getStatCON(); - _hennaWIT += ((_hennaWIT + h.getStatWIT()) > 5) ? 5 - _hennaWIT : h.getStatWIT(); - _hennaDEX += ((_hennaDEX + h.getStatDEX()) > 5) ? 5 - _hennaDEX : h.getStatDEX(); - _hennaLUC += ((_hennaLUC + h.getStatLUC()) > 5) ? 5 - _hennaLUC : h.getStatLUC(); - _hennaCHA += ((_hennaCHA + h.getStatCHA()) > 5) ? 5 - _hennaCHA : h.getStatCHA(); - } + _hennaINT += ((_hennaINT + h.getStatINT()) > 5) ? 5 - _hennaINT : h.getStatINT(); + _hennaSTR += ((_hennaSTR + h.getStatSTR()) > 5) ? 5 - _hennaSTR : h.getStatSTR(); + _hennaMEN += ((_hennaMEN + h.getStatMEN()) > 5) ? 5 - _hennaMEN : h.getStatMEN(); + _hennaCON += ((_hennaCON + h.getStatCON()) > 5) ? 5 - _hennaCON : h.getStatCON(); + _hennaWIT += ((_hennaWIT + h.getStatWIT()) > 5) ? 5 - _hennaWIT : h.getStatWIT(); + _hennaDEX += ((_hennaDEX + h.getStatDEX()) > 5) ? 5 - _hennaDEX : h.getStatDEX(); + _hennaLUC += ((_hennaLUC + h.getStatLUC()) > 5) ? 5 - _hennaLUC : h.getStatLUC(); + _hennaCHA += ((_hennaCHA + h.getStatCHA()) > 5) ? 5 - _hennaCHA : h.getStatCHA(); } } } @@ -8566,11 +8554,7 @@ public final class L2PcInstance extends L2Playable // Check if the attacker is in olympia and olympia start if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) { - if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) - { - return true; - } - return false; + return isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId()); } // Check if the attacker is in TvT and TvT is started @@ -8617,7 +8601,7 @@ public final class L2PcInstance extends L2Playable // Check if the L2PcInstance is in an arena, but NOT siege zone. NOTE: This check comes before clan/ally checks, but after party checks. // This is done because in arenas, clan/ally members can autoattack if they arent in party. - if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && !(isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))) + if (isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP) && (!isInsideZone(ZoneId.SIEGE) || !attackerPlayer.isInsideZone(ZoneId.SIEGE))) { return true; } @@ -8635,7 +8619,7 @@ public final class L2PcInstance extends L2Playable } // Now check again if the L2PcInstance is in pvp zone, but this time at siege PvP zone, applying clan/ally checks - if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && (isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))) + if (isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP) && isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE)) { return true; } @@ -8650,7 +8634,7 @@ public final class L2PcInstance extends L2Playable if (getClan() != null) { final Siege siege = SiegeManager.getInstance().getSiege(this); - return ((siege != null) && siege.checkIsAttacker(getClan())); + return (siege != null) && siege.checkIsAttacker(getClan()); } } @@ -8924,7 +8908,7 @@ public final class L2PcInstance extends L2Playable final int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000); final int hours = remainingTime / 3600; final int minutes = (remainingTime % 3600) / 60; - final int seconds = (remainingTime % 60); + final int seconds = remainingTime % 60; if (hours > 0) { sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_S2_HOUR_S_S3_MINUTE_S_AND_S4_SECOND_S_REMAINING_IN_S1_S_RE_USE_TIME); @@ -8971,7 +8955,7 @@ public final class L2PcInstance extends L2Playable // Check if this is bad magic skill if (skill.isBad()) { - if ((isInsidePeaceZone(this, target)) && !getAccessLevel().allowPeaceAttack()) + if (isInsidePeaceZone(this, target) && !getAccessLevel().allowPeaceAttack()) { // If L2Character or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_THIS_TARGET_IN_A_PEACEFUL_ZONE); @@ -9139,12 +9123,7 @@ public final class L2PcInstance extends L2Playable return getParty().getCommandChannel().getMembers().contains(looter); } - if (isInParty() && (looter != null)) - { - return getParty().getMembers().contains(looter); - } - - return false; + return isInParty() && (looter != null) && getParty().getMembers().contains(looter); } /** @@ -9211,11 +9190,7 @@ public final class L2PcInstance extends L2Playable } else if ((getParty().getCommandChannel() != null) && getParty().getCommandChannel().containsPlayer(targetPlayer)) { - if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage()) - { - return true; - } - return false; + return (skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage(); } } @@ -9233,20 +9208,12 @@ public final class L2PcInstance extends L2Playable if (aClan.isAtWarWith(tClan.getId()) && tClan.isAtWarWith(aClan.getId())) { // Check if skill can do damage - if ((skill.isAOE() && (skill.getEffectRange() > 0)) && isCtrlPressed && (getTarget() == target)) - { - return true; - } - return isCtrlPressed; + return (skill.isAOE() && (skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target)) || isCtrlPressed; } else if ((getClanId() == targetPlayer.getClanId()) || ((getAllyId() > 0) && (getAllyId() == targetPlayer.getAllyId()))) { // Check if skill can do damage - if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage()) - { - return true; - } - return false; + return (skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage(); } } @@ -9260,18 +9227,10 @@ public final class L2PcInstance extends L2Playable if ((targetPlayer.getPvpFlag() == 0) && (targetPlayer.getReputation() > 0)) { // Check if skill can do damage - if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage()) - { - return true; - } - return false; + return (skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage(); } - if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0)) - { - return true; - } - return false; + return (targetPlayer.getPvpFlag() > 0) || (targetPlayer.getReputation() < 0); } return true; } @@ -9300,7 +9259,7 @@ public final class L2PcInstance extends L2Playable // if this is a castle that is currently being sieged, and the rider is NOT a castle owner // he cannot land. // castle owner is the leader of the clan that owns the castle where the pc is - if (isInsideZone(ZoneId.SIEGE) && !((getClan() != null) && (CastleManager.getInstance().getCastle(this) == CastleManager.getInstance().getCastleByOwner(getClan())) && (this == getClan().getLeader().getPlayerInstance()))) + if (isInsideZone(ZoneId.SIEGE) && ((getClan() == null) || (CastleManager.getInstance().getCastle(this) != CastleManager.getInstance().getCastleByOwner(getClan())) || (this != getClan().getLeader().getPlayerInstance()))) { return true; } @@ -10897,16 +10856,13 @@ public final class L2PcInstance extends L2Playable { reviver.sendPacket(SystemMessageId.RESURRECTION_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed. } + else if (Pet) + { + reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. + } else { - if (Pet) - { - reviver.sendPacket(SystemMessageId.A_PET_CANNOT_BE_RESURRECTED_WHILE_IT_S_OWNER_IS_IN_THE_PROCESS_OF_RESURRECTING); // A pet cannot be resurrected while it's owner is in the process of resurrecting. - } - else - { - reviver.sendPacket(SystemMessageId.WHILE_A_PET_IS_BEING_RESURRECTED_IT_CANNOT_HELP_IN_RESURRECTING_ITS_MASTER); // While a pet is attempting to resurrect, it cannot help in resurrecting its master. - } + reviver.sendPacket(SystemMessageId.WHILE_A_PET_IS_BEING_RESURRECTED_IT_CANNOT_HELP_IN_RESURRECTING_ITS_MASTER); // While a pet is attempting to resurrect, it cannot help in resurrecting its master. } return; } @@ -10974,7 +10930,7 @@ public final class L2PcInstance extends L2Playable public boolean isReviveRequested() { - return (_reviveRequested == 1); + return _reviveRequested == 1; } public boolean isRevivingPet() @@ -11115,13 +11071,10 @@ public final class L2PcInstance extends L2Playable } } } - else + else if (_teleportWatchdog != null) { - if (_teleportWatchdog != null) - { - _teleportWatchdog.cancel(false); - _teleportWatchdog = null; - } + _teleportWatchdog.cancel(false); + _teleportWatchdog = null; } } @@ -12687,7 +12640,7 @@ public final class L2PcInstance extends L2Playable percent *= calcStat(Stats.REDUCE_DEATH_PENALTY_BY_PVP, 1); } - if ((killer.isInCategory(CategoryType.SHILENS_FOLLOWERS) || (Rnd.get(1, 100) <= ((Config.DEATH_PENALTY_CHANCE) * percent))) && (!killer.isPlayable() || (getReputation() < 0))) + if ((killer.isInCategory(CategoryType.SHILENS_FOLLOWERS) || (Rnd.get(1, 100) <= (Config.DEATH_PENALTY_CHANCE * percent))) && (!killer.isPlayable() || (getReputation() < 0))) { increaseShilensBreathDebuff(); } @@ -12792,7 +12745,7 @@ public final class L2PcInstance extends L2Playable sm.addPcName(this); sm.addCharName(target); sm.addInt(damage); - sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); + sm.addPopup(target.getObjectId(), getObjectId(), damage * -1); } sendPacket(sm); } @@ -13048,7 +13001,7 @@ public final class L2PcInstance extends L2Playable public boolean isFlyingMounted() { - return (isTransformed() && (getTransformation().isFlying())); + return isTransformed() && getTransformation().isFlying(); } /** @@ -13655,7 +13608,7 @@ public final class L2PcInstance extends L2Playable { friend.setLevel(rs.getByte("level")); friend.setClassId(rs.getInt("classid")); - bClassId = (rs.getInt("base_class")); + bClassId = rs.getInt("base_class"); friend.setClanId(rs.getInt("clanid")); friend.setLastLogin(rs.getLong("lastAccess")); friend.setCreateDate(rs.getLong("createDate")); @@ -14138,7 +14091,7 @@ public final class L2PcInstance extends L2Playable public boolean canMakeSocialAction() { - return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && !isCastingSimultaneouslyNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)); + return (getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && !isCastingSimultaneouslyNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE); } public void setMultiSocialAction(int id, int targetId) @@ -14225,7 +14178,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isInventoryUnder90(boolean includeQuestInv) { - return (getInventory().getSize(includeQuestInv) <= (getInventoryLimit() * 0.9)); + return getInventory().getSize(includeQuestInv) <= (getInventoryLimit() * 0.9); } public boolean havePetInvItems() @@ -14761,15 +14714,7 @@ public final class L2PcInstance extends L2Playable */ public boolean isAtWarWith(L2Character target) { - if (target == null) - { - return false; - } - if ((_clan != null) && !isAcademyMember() && (target.getClan() != null) && !target.isAcademyMember()) - { - return _clan.isAtWarWith(target.getClan()); - } - return false; + return (target != null) && (_clan != null) && !isAcademyMember() && (target.getClan() != null) && !target.isAcademyMember() && _clan.isAtWarWith(target.getClan()); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java index d14f6de105..8fe1409aba 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2PetInstance.java @@ -235,7 +235,7 @@ public class L2PetInstance extends L2Summon } } - public synchronized static L2PetInstance spawnPet(L2NpcTemplate template, L2PcInstance owner, L2ItemInstance control) + public static synchronized L2PetInstance spawnPet(L2NpcTemplate template, L2PcInstance owner, L2ItemInstance control) { if (L2World.getInstance().getPet(owner.getObjectId()) != null) { @@ -556,13 +556,13 @@ public class L2PetInstance extends L2Summon if (target.getItem().hasExImmediateEffect()) { final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem()); - if (handler == null) + if (handler != null) { - _log.warning("No item handler registered for item ID: " + target.getId() + "."); + handler.useItem(this, target, false); } else { - handler.useItem(this, target, false); + _log.warning("No item handler registered for item ID: " + target.getId() + "."); } ItemTable.getInstance().destroyItem("Consume", target, getOwner(), null); @@ -1204,7 +1204,7 @@ public class L2PetInstance extends L2Summon final int maxLoad = getMaxLoad(); if (maxLoad > 0) { - final long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / maxLoad); + final long weightproc = ((getCurrentLoad() - getBonusWeightPenalty()) * 1000) / maxLoad; int newWeightPenalty; if ((weightproc < 500) || getOwner().getDietMode()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java index 41de15103f..aac6ae606a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2RaidBossInstance.java @@ -80,7 +80,7 @@ public class L2RaidBossInstance extends L2MonsterInstance { for (L2PcInstance member : player.getParty().getMembers()) { - member.setRaidPoints(member.getRaidPoints() + ((getLevel() / 2) + Rnd.get(-5, 5))); + member.setRaidPoints(member.getRaidPoints() + (getLevel() / 2) + Rnd.get(-5, 5)); if (member.isNoble()) { Hero.getInstance().setRBkilled(member.getObjectId(), getId()); @@ -89,7 +89,7 @@ public class L2RaidBossInstance extends L2MonsterInstance } else { - player.setRaidPoints(player.getRaidPoints() + ((getLevel() / 2) + Rnd.get(-5, 5))); + player.setRaidPoints(player.getRaidPoints() + (getLevel() / 2) + Rnd.get(-5, 5)); if (player.isNoble()) { Hero.getInstance().setRBkilled(player.getObjectId(), getId()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java index 2269c8d86d..71eabc01c3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2ServitorInstance.java @@ -88,7 +88,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable @Override public final int getLevel() { - return (getTemplate() != null ? getTemplate().getLevel() : 0); + return getTemplate() != null ? getTemplate().getLevel() : 0; } @Override @@ -500,7 +500,7 @@ public class L2ServitorInstance extends L2Summon implements Runnable @Override public int getCriticalHit(L2Character target, Skill skill) { - return (int) (super.getCriticalHit(target, skill) + ((getActingPlayer().getCriticalHit(target, skill)) * (getActingPlayer().getServitorShareBonus(Stats.CRITICAL_RATE) - 1.0))); + return (int) (super.getCriticalHit(target, skill) + (getActingPlayer().getCriticalHit(target, skill) * (getActingPlayer().getServitorShareBonus(Stats.CRITICAL_RATE) - 1.0))); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeFlagInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeFlagInstance.java index 14a192d2bd..8b419351e8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeFlagInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2SiegeFlagInstance.java @@ -84,13 +84,13 @@ public class L2SiegeFlagInstance extends L2Npc @Override public boolean canBeAttacked() { - return !(isInvul() || isHpBlocked()); + return !isInvul() && !isHpBlocked(); } @Override public boolean isAutoAttackable(L2Character attacker) { - return !(isInvul() || isHpBlocked()); + return !isInvul() && !isHpBlocked(); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java index 16ed8e59f7..8799957da2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java @@ -176,7 +176,7 @@ public final class L2StaticObjectInstance extends L2Character public void setMeshIndex(int meshIndex) { _meshIndex = meshIndex; - this.broadcastPacket(new StaticObject(this)); + broadcastPacket(new StaticObject(this)); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java index 0ff3721c65..8d11ad73ac 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TamedBeastInstance.java @@ -219,7 +219,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance for (Skill skill : _beastSkills) { ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(skill), delay); - delay += (100 + skill.getHitTime()); + delay += 100 + skill.getHitTime(); } ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(null), delay); } @@ -236,13 +236,13 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance @Override public void run() { - if (_skill == null) + if (_skill != null) { - getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); + sitCastAndFollow(_skill, _owner); } else { - sitCastAndFollow(_skill, _owner); + getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner); } } } @@ -353,7 +353,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance return; } - final float HPRatio = ((float) _owner.getCurrentHp()) / _owner.getMaxHp(); + final float HPRatio = (float) _owner.getCurrentHp() / _owner.getMaxHp(); // if the owner has a lot of HP, then debuff the enemy with a random debuff among the available skills // use of more than one debuff at this moment is acceptable @@ -362,7 +362,7 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance for (Skill skill : getTemplate().getSkills().values()) { // if the skill is a debuff, check if the attacker has it already [ attacker.getEffect(L2Skill skill) ] - if (skill.isDebuff() && (Rnd.get(3) < 1) && ((attacker != null) && attacker.isAffectedBySkill(skill.getId()))) + if (skill.isDebuff() && (Rnd.get(3) < 1) && (attacker != null) && attacker.isAffectedBySkill(skill.getId())) { sitCastAndFollow(skill, attacker); } @@ -460,14 +460,11 @@ public final class L2TamedBeastInstance extends L2FeedableBeastInstance owner.callSkill(SkillData.getInstance().getSkill(foodTypeSkillId, 1), targets); owner.setTarget(oldTarget); } - else + // if the owner has no food, the beast immediately despawns, except when it was only + // newly spawned. Newly spawned beasts can last up to 5 minutes + else if (_tamedBeast.getRemainingTime() < (MAX_DURATION - 300000)) { - // if the owner has no food, the beast immediately despawns, except when it was only - // newly spawned. Newly spawned beasts can last up to 5 minutes - if (_tamedBeast.getRemainingTime() < (MAX_DURATION - 300000)) - { - _tamedBeast.setRemainingTime(-1); - } + _tamedBeast.setRemainingTime(-1); } // There are too many conflicting reports about whether distance from home should be taken into consideration. Disabled for now. // if (_tamedBeast.isTooFarFromHome()) diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java index fa6a2ac513..57caf7aea0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -237,7 +237,7 @@ public final class L2TeleporterInstance extends L2Npc final Calendar cal = Calendar.getInstance(); final int hour = cal.get(Calendar.HOUR_OF_DAY); final int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK); - if ((hour >= 20) && ((dayOfWeek >= Calendar.MONDAY) && (dayOfWeek <= Calendar.TUESDAY))) + if ((hour >= 20) && (dayOfWeek >= Calendar.MONDAY) && (dayOfWeek <= Calendar.TUESDAY)) { return loc.getFeeCount() / 2; } @@ -247,7 +247,7 @@ public final class L2TeleporterInstance extends L2Npc protected boolean shouldPayFee(L2PcInstance player, TeleportType type, TeleportLocation loc) { - return (type != TeleportType.NORMAL) || (!Config.FREE_TELEPORTING && ((player.getLevel() > 76) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0))); + return (type != TeleportType.NORMAL) || (!Config.FREE_TELEPORTING && ((player.getLevel() > 76) || player.isSubClassActive()) && (loc.getFeeId() != 0) && (loc.getFeeCount() > 0)); } protected int parseNextInt(StringTokenizer st, int defaultVal) @@ -454,7 +454,7 @@ public final class L2TeleporterInstance extends L2Npc final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId()); - final String filename = !HtmCache.getInstance().isLoadable(("html/teleporter/half/" + getId() + ".htm")) ? "html/teleporter/" + getId() + "-1.htm" : "html/teleporter/half/" + getId() + ".htm"; + final String filename = !HtmCache.getInstance().isLoadable("html/teleporter/half/" + getId() + ".htm") ? "html/teleporter/" + getId() + "-1.htm" : "html/teleporter/half/" + getId() + ".htm"; html.setFile(player.getHtmlPrefix(), filename); html.replace("%objectId%", String.valueOf(getObjectId())); html.replace("%npcname%", getName()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index d2d14485cb..13a7cb0f79 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -346,7 +346,7 @@ public final class L2TrapInstance extends L2Npc sm.addCharName(this); sm.addCharName(target); sm.addInt(damage); - sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); + sm.addPopup(target.getObjectId(), getObjectId(), damage * -1); _owner.sendPacket(sm); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 65fdee0ec9..9d49fac6d0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -158,13 +158,13 @@ public class L2VillageMasterInstance extends L2NpcInstance return; } - if (player.getClan() == null) + if (player.getClan() != null) { - player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); + player.getClan().createAlly(player, cmdParams); } else { - player.getClan().createAlly(player, cmdParams); + player.sendPacket(SystemMessageId.ONLY_CLAN_LEADERS_MAY_CREATE_ALLIANCES); } } else if (actualCommand.equalsIgnoreCase("dissolve_ally")) @@ -309,7 +309,7 @@ public class L2VillageMasterInstance extends L2NpcInstance return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass); } - private static final void dissolveClan(L2PcInstance player, int clanId) + private static void dissolveClan(L2PcInstance player, int clanId) { if (!player.isClanLeader()) { @@ -370,7 +370,7 @@ public class L2VillageMasterInstance extends L2NpcInstance ClanTable.getInstance().scheduleRemoveClan(clan.getId()); } - private static final void recoverClan(L2PcInstance player, int clanId) + private static void recoverClan(L2PcInstance player, int clanId) { if (!player.isClanLeader()) { @@ -383,7 +383,7 @@ public class L2VillageMasterInstance extends L2NpcInstance clan.updateClanInDB(); } - private static final void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) + private static void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) { if (!player.isClanLeader()) { @@ -493,7 +493,7 @@ public class L2VillageMasterInstance extends L2NpcInstance } } - private static final void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName) + private static void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName) { if (!player.isClanLeader()) { @@ -526,7 +526,7 @@ public class L2VillageMasterInstance extends L2NpcInstance player.sendMessage("Pledge name changed."); } - private static final void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) + private static void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) { if (!player.isClanLeader()) { @@ -588,7 +588,7 @@ public class L2VillageMasterInstance extends L2NpcInstance * this displays PledgeSkillList to the player. * @param player */ - public static final void showPledgeSkillList(L2PcInstance player) + public static void showPledgeSkillList(L2PcInstance player) { if (!player.isClanLeader()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/DefenderKnownList.java b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/DefenderKnownList.java index 22af7b291c..15d24428f9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/DefenderKnownList.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/DefenderKnownList.java @@ -50,10 +50,10 @@ public class DefenderKnownList extends AttackableKnownList { player = object.getActingPlayer(); } - final int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : hall != null ? hall.getId() : 0)); + final int activeSiegeId = fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : hall != null ? hall.getId() : 0); // Check if player is an enemy of this defender npc - if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1)) || (player.getSiegeState() == 0))) + if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || (player.getSiegeState() == 1) || (player.getSiegeState() == 0))) { if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java index 89a693951d..cadf16932a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/GuardKnownList.java @@ -73,7 +73,7 @@ public class GuardKnownList extends AttackableKnownList } } } - else if ((Config.GUARD_ATTACK_AGGRO_MOB && getActiveChar().isInActiveRegion()) && object.isMonster() && ((L2MonsterInstance) object).isAggressive()) + else if (Config.GUARD_ATTACK_AGGRO_MOB && getActiveChar().isInActiveRegion() && object.isMonster() && ((L2MonsterInstance) object).isAggressive()) { if (Config.DEBUG) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java index fb50fb3c5b..540d511a79 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/knownlist/PcKnownList.java @@ -77,16 +77,13 @@ public class PcKnownList extends PlayableKnownList // else if (object.getPolytype().equals("npc")) // sendPacket(new NpcInfoPoly(object, this)); } - else + else if (object.isVisibleFor(getActiveChar())) { - if (object.isVisibleFor(getActiveChar())) + object.sendInfo(getActiveChar()); + + if ((object instanceof L2Character) && ((L2Character) object).hasAI()) { - object.sendInfo(getActiveChar()); - - if ((object instanceof L2Character) && ((L2Character) object).hasAI()) - { - ((L2Character) object).getAI().describeStateToPlayer(getActiveChar()); - } + ((L2Character) object).getAI().describeStateToPlayer(getActiveChar()); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java index e966202937..62ace6a3c1 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java @@ -160,7 +160,7 @@ public class CharStat */ public final float getAttackSpeedMultiplier() { - return (float) (((1.1) * getPAtkSpd()) / _activeChar.getTemplate().getBasePAtkSpd()); + return (float) ((1.1 * getPAtkSpd()) / _activeChar.getTemplate().getBasePAtkSpd()); } /** @@ -188,7 +188,7 @@ public class CharStat { if (maxCrit > 0) { - val = Math.min(val, (Config.MAX_PCRIT_RATE + maxCrit)); + val = Math.min(val, Config.MAX_PCRIT_RATE + maxCrit); } else { @@ -587,7 +587,7 @@ public class CharStat */ public double getPDef(L2Character target) { - return calcStat(Stats.POWER_DEFENCE, (_activeChar.isRaid()) ? _activeChar.getTemplate().getBasePDef() * Config.RAID_PDEFENCE_MULTIPLIER : _activeChar.getTemplate().getBasePDef(), target, null); + return calcStat(Stats.POWER_DEFENCE, _activeChar.isRaid() ? _activeChar.getTemplate().getBasePDef() * Config.RAID_PDEFENCE_MULTIPLIER : _activeChar.getTemplate().getBasePDef(), target, null); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java index 3a6ede2cf4..c20fc73fea 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java @@ -183,22 +183,19 @@ public class PcStat extends PlayableStat sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP); sm.addLong(addToExp); } + else if (addToExp > baseExp) + { + sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4); + sm.addLong(addToExp); + sm.addLong(addToExp - baseExp); + sm.addLong(addToSp); + sm.addLong(addToSp - baseSp); + } else { - if (addToExp > baseExp) - { - sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACQUIRED_S1_XP_BONUS_S2_AND_S3_SP_BONUS_S4); - sm.addLong(addToExp); - sm.addLong(addToExp - baseExp); - sm.addLong(addToSp); - sm.addLong(addToSp - baseSp); - } - else - { - sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP_AND_S2_SP); - sm.addLong(addToExp); - sm.addLong(addToSp); - } + sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_XP_AND_S2_SP); + sm.addLong(addToExp); + sm.addLong(addToSp); } activeChar.sendPacket(sm); return true; @@ -765,12 +762,12 @@ public class PcStat extends PlayableStat if (vitality > 1.0) { - bonus += (vitality - 1); + bonus += vitality - 1; } if (bonusExp > 1) { - bonus += (bonusExp - 1); + bonus += bonusExp - 1; } // Check for abnormal bonuses @@ -794,12 +791,12 @@ public class PcStat extends PlayableStat if (vitality > 1.0) { - bonus += (vitality - 1); + bonus += vitality - 1; } if (bonusSp > 1) { - bonus += (bonusSp - 1); + bonus += bonusSp - 1; } // Check for abnormal bonuses diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 1237fb6724..259c78a7af 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -167,7 +167,7 @@ public class PlayableStat extends CharStat } } - final boolean levelIncreased = ((getLevel() + value) > getLevel()); + final boolean levelIncreased = (getLevel() + value) > getLevel(); value += getLevel(); setLevel(value); diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java b/trunk/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java index 51bd6bf311..d3f1292062 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/status/CharStatus.java @@ -138,7 +138,7 @@ public class CharStatus } // invul handling - if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !(isDOT || isHPConsumption)) + if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !isDOT && !isHPConsumption) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java b/trunk/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java index 56f8051fb3..155fcea9dd 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/status/PcStatus.java @@ -74,7 +74,7 @@ public class PcStatus extends PlayableStatus return; } - if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !getActiveChar().isVulnerableFor(attacker) && !(isDOT || isHPConsumption)) + if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !getActiveChar().isVulnerableFor(attacker) && !isDOT && !isHPConsumption) { return; } @@ -175,7 +175,7 @@ public class PcStatus extends PlayableStatus final L2PcInstance caster = getActiveChar().getTransferingDamageTo(); if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster)) { - int transferDmg = Math.min((int) caster.getCurrentHp() - 1, (((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100)); + int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100); if (transferDmg > 0) { @@ -304,7 +304,7 @@ public class PcStatus extends PlayableStatus return; } - if ((attacker != null) && (attacker.isPlayer())) + if ((attacker != null) && attacker.isPlayer()) { final int hpRestore = (int) attacker.getStat().calcStat(Stats.HP_RESTORE_ON_KILL, 0, null, null); if (hpRestore > 0) diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/status/SummonStatus.java b/trunk/java/com/l2jmobius/gameserver/model/actor/status/SummonStatus.java index 54d9f1a5df..ba75a9837b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/actor/status/SummonStatus.java +++ b/trunk/java/com/l2jmobius/gameserver/model/actor/status/SummonStatus.java @@ -56,7 +56,7 @@ public class SummonStatus extends PlayableStatus { if ((caster != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && getActiveChar().getParty().getMembers().contains(caster)) { - int transferDmg = Math.min((int) caster.getCurrentHp() - 1, (((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100)); + int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100); if (transferDmg > 0) { @@ -90,7 +90,7 @@ public class SummonStatus extends PlayableStatus } else if ((caster != null) && (caster == getActiveChar().getOwner()) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead()) // when no party, transfer only to owner (caster) { - int transferDmg = Math.min((int) caster.getCurrentHp() - 1, (((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100)); + int transferDmg = Math.min((int) caster.getCurrentHp() - 1, ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100); if (transferDmg > 0) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java b/trunk/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java index 929b7d5e50..dc3411072e 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java +++ b/trunk/java/com/l2jmobius/gameserver/model/announce/AutoAnnouncement.java @@ -172,7 +172,7 @@ public final class AutoAnnouncement extends Announcement implements Runnable } for (String content : getContent().split(Config.EOL)) { - Broadcast.toAllOnlinePlayers(content, (getType() == AnnouncementType.AUTO_CRITICAL)); + Broadcast.toAllOnlinePlayers(content, getType() == AnnouncementType.AUTO_CRITICAL); } if (_currentState != -1) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/announce/IAnnouncement.java b/trunk/java/com/l2jmobius/gameserver/model/announce/IAnnouncement.java index 7ad99912e1..c3a4d992b0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/announce/IAnnouncement.java +++ b/trunk/java/com/l2jmobius/gameserver/model/announce/IAnnouncement.java @@ -25,19 +25,19 @@ import com.l2jmobius.gameserver.model.interfaces.IUpdatable; */ public interface IAnnouncement extends IStorable, IUpdatable, IDeletable { - public int getId(); + int getId(); - public AnnouncementType getType(); + AnnouncementType getType(); - public void setType(AnnouncementType type); + void setType(AnnouncementType type); - public boolean isValid(); + boolean isValid(); - public String getContent(); + String getContent(); - public void setContent(String content); + void setContent(String content); - public String getAuthor(); + String getAuthor(); - public void setAuthor(String author); + void setAuthor(String author); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/base/ClassId.java b/trunk/java/com/l2jmobius/gameserver/model/base/ClassId.java index 7f803db5eb..4cb49f05c5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/base/ClassId.java +++ b/trunk/java/com/l2jmobius/gameserver/model/base/ClassId.java @@ -380,12 +380,12 @@ public enum ClassId implements IIdentifiable */ public final int level() { - if (_parent == null) + if (_parent != null) { - return 0; + return 1 + _parent.level(); } - return 1 + _parent.level(); + return 0; } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/base/PlayerClass.java b/trunk/java/com/l2jmobius/gameserver/model/base/PlayerClass.java index 2c67672728..a100d39c1f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/base/PlayerClass.java +++ b/trunk/java/com/l2jmobius/gameserver/model/base/PlayerClass.java @@ -257,7 +257,7 @@ public enum PlayerClass _type = pType; } - public static final EnumSet getSet(Race race, ClassLevel level) + public static EnumSet getSet(Race race, ClassLevel level) { final EnumSet allOf = EnumSet.noneOf(PlayerClass.class); diff --git a/trunk/java/com/l2jmobius/gameserver/model/clientstrings/Builder.java b/trunk/java/com/l2jmobius/gameserver/model/clientstrings/Builder.java index 2bbcc1ae11..fbfe60e944 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/trunk/java/com/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -29,7 +29,7 @@ public abstract class Builder public abstract int getIndex(); - public static final Builder newBuilder(String text) + public static Builder newBuilder(String text) { final ArrayList builders = new ArrayList<>(); diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionListener.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionListener.java index 66b21fd650..09ead6c16e 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionListener.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionListener.java @@ -29,5 +29,5 @@ public interface ConditionListener /** * Notify changed. */ - public void notifyChanged(); + void notifyChanged(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java index 9022d28cfb..e71ed7e9af 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java @@ -54,6 +54,6 @@ public class ConditionPlayerActiveEffectId extends Condition public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { final BuffInfo info = effector.getEffectList().getBuffInfoBySkillId(_effectId); - return ((info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel()))); + return (info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel())); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java index 6aa93ea488..1e3a35e55a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java @@ -65,6 +65,6 @@ public class ConditionPlayerCallPc extends Condition player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA); canCallPlayer = false; } - return (_val == canCallPlayer); + return _val == canCallPlayer; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java index fb3cc92645..ed57d364f0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java @@ -96,6 +96,6 @@ public class ConditionPlayerCanCreateBase extends Condition player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE); canCreateBase = false; } - return (_val == canCreateBase); + return _val == canCreateBase; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java index 7c58176077..3b3fd40b19 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java @@ -77,6 +77,6 @@ public class ConditionPlayerCanCreateOutpost extends Condition player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE); canCreateOutpost = false; } - return (_val == canCreateOutpost); + return _val == canCreateOutpost; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java index c81a459664..9060d5947c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java @@ -74,6 +74,6 @@ public class ConditionPlayerCanEscape extends Condition { canTeleport = false; } - return (_val == canTeleport); + return _val == canTeleport; } } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java index 01aae5ce27..97838dbfdf 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java @@ -112,6 +112,6 @@ public class ConditionPlayerCanResurrect extends Condition } } } - return (_val == canResurrect); + return _val == canResurrect; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java index 5fbd4c8d6c..0499dc2c05 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java @@ -62,6 +62,6 @@ public class ConditionPlayerCanSummonPet extends Condition { canSummon = false; } - return (_val == canSummon); + return _val == canSummon; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java index c747a3daa2..06e30b54aa 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java @@ -71,6 +71,6 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition player.sendPacket(SystemMessageId.INVALID_TARGET); canSummonSiegeGolem = false; } - return (_val == canSummonSiegeGolem); + return _val == canSummonSiegeGolem; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java index 275099506a..2972e67f50 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java @@ -82,6 +82,6 @@ public class ConditionPlayerCanSweep extends Condition } } } - return (_val == canSweep); + return _val == canSweep; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java index 68f9be1b1e..2e3acfbb50 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java @@ -68,6 +68,6 @@ public class ConditionPlayerCanTakeFort extends Condition player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED); canTakeFort = false; } - return (_val == canTakeFort); + return _val == canTakeFort; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java index 749569a62e..30b790a6ea 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java @@ -64,6 +64,6 @@ public class ConditionPlayerCanTransform extends Condition player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET); canTransform = false; } - return (_val == canTransform); + return _val == canTransform; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java index 7b4e1bca0e..d56fdb83d3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java @@ -54,6 +54,6 @@ public class ConditionPlayerCanUntransform extends Condition player.sendPacket(SystemMessageId.YOU_ARE_TOO_HIGH_TO_PERFORM_THIS_ACTION_PLEASE_LOWER_YOUR_ALTITUDE_AND_TRY_AGAIN); // TODO: check if message is retail like. canUntransform = false; } - return (_val == canUntransform); + return _val == canUntransform; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java index 12e721c1f1..cf047e31e5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java @@ -56,6 +56,6 @@ public class ConditionPlayerCheckAbnormal extends Condition public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { final BuffInfo info = effector.getEffectList().getBuffInfoByAbnormalType(_type); - return ((info != null) && ((_level == -1) || (_level >= info.getSkill().getAbnormalLvl()))); + return (info != null) && ((_level == -1) || (_level >= info.getSkill().getAbnormalLvl())); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java index 7137f40e63..c3ac1b0115 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java @@ -41,6 +41,6 @@ public class ConditionPlayerClassIdRestriction extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - return (effector.getActingPlayer() != null) && (_classIds.contains(effector.getActingPlayer().getClassId().getId())); + return (effector.getActingPlayer() != null) && _classIds.contains(effector.getActingPlayer().getClassId().getId()); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java index 3ba5af4d0f..6906be0315 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java @@ -55,7 +55,7 @@ public final class ConditionPlayerHasClanHall extends Condition final L2Clan clan = effector.getActingPlayer().getClan(); if (clan == null) { - return ((_clanHall.size() == 1) && (_clanHall.get(0) == 0)); + return (_clanHall.size() == 1) && (_clanHall.get(0) == 0); } // All Clan Hall diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasServitor.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasServitor.java index b94e6af64c..cb79959bf9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasServitor.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasServitor.java @@ -30,7 +30,7 @@ public class ConditionPlayerHasServitor extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if ((effector.getActingPlayer() == null)) + if (effector.getActingPlayer() == null) { return false; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java index d7d59c3f87..5bda99bde9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java @@ -40,10 +40,6 @@ public class ConditionPlayerInvSize extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if (effector.getActingPlayer() != null) - { - return effector.getActingPlayer().getInventory().getSize(false) <= (effector.getActingPlayer().getInventoryLimit() - _size); - } - return true; + return (effector.getActingPlayer() == null) || (effector.getActingPlayer().getInventory().getSize(false) <= (effector.getActingPlayer().getInventoryLimit() - _size)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java index 696b7986fc..58d2087368 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java @@ -40,6 +40,6 @@ public class ConditionPlayerLevelRange extends Condition public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { final int level = effector.getLevel(); - return ((level >= _levels[0]) && (level <= _levels[1])); + return (level >= _levels[0]) && (level <= _levels[1]); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java index 5ad0a9ca1a..bd29bbc742 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java @@ -44,10 +44,6 @@ public final class ConditionPlayerPledgeClass extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null)) - { - return false; - } - return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass); + return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getClan() != null) && ((_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java index ad0aaf8d24..912640ca82 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java @@ -67,15 +67,15 @@ public class ConditionPlayerState extends Condition } case FLYING: { - return (character.isFlying() == _required); + return character.isFlying() == _required; } case BEHIND: { - return (character.isBehindTarget() == _required); + return character.isBehindTarget() == _required; } case FRONT: { - return (character.isInFrontOfTarget() == _required); + return character.isInFrontOfTarget() == _required; } case CHAOTIC: { diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java index 374382e0bf..7af203c234 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java @@ -44,7 +44,7 @@ public class ConditionPlayerWeight extends Condition final L2PcInstance player = effector.getActingPlayer(); if ((player != null) && (player.getMaxLoad() > 0)) { - final int weightproc = (((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad()); + final int weightproc = ((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad(); return (weightproc < _weight) || player.getDietMode(); } return true; diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java index 472e3752b5..56d02e80d1 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java @@ -88,7 +88,7 @@ public final class ConditionSiegeZone extends Condition final L2PcInstance player = (L2PcInstance) activeChar; - if (((castle == null) || (castle.getResidenceId() <= 0))) + if ((castle == null) || (castle.getResidenceId() <= 0)) { if ((value & COND_NOT_ZONE) != 0) { @@ -134,7 +134,7 @@ public final class ConditionSiegeZone extends Condition final L2PcInstance player = (L2PcInstance) activeChar; - if (((fort == null) || (fort.getResidenceId() <= 0))) + if ((fort == null) || (fort.getResidenceId() <= 0)) { if ((value & COND_NOT_ZONE) != 0) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java index d8ffcd5c40..8ad975c504 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java @@ -52,10 +52,10 @@ public final class ConditionSlotItemId extends ConditionInventory } final L2ItemInstance itemSlot = effector.getInventory().getPaperdollItem(_slot); - if (itemSlot == null) + if (itemSlot != null) { - return _itemId == 0; + return (itemSlot.getId() == _itemId) && (itemSlot.getEnchantLevel() >= _enchantLevel); } - return (itemSlot.getId() == _itemId) && (itemSlot.getEnchantLevel() >= _enchantLevel); + return _itemId == 0; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java index 8d9e8b6e8d..ea62e07006 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java @@ -46,10 +46,6 @@ public class ConditionTargetAggro extends Condition { return ((L2MonsterInstance) effected).isAggressive() == _isAggro; } - if (effected instanceof L2PcInstance) - { - return ((L2PcInstance) effected).getReputation() < 0; - } - return false; + return (effected instanceof L2PcInstance) && (((L2PcInstance) effected).getReputation() < 0); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java index 45fa4d6023..e214ce6e95 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java @@ -41,6 +41,6 @@ public class ConditionTargetClassIdRestriction extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - return effected.isPlayer() && _classIds.contains((effected.getActingPlayer()).getClassId().getId()); + return effected.isPlayer() && _classIds.contains(effected.getActingPlayer().getClassId().getId()); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java index 6985e78d10..97006fab62 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java @@ -44,6 +44,6 @@ public class ConditionTargetLevelRange extends Condition return false; } final int level = effected.getLevel(); - return ((level >= _levels[0]) && (level <= _levels[1])); + return (level >= _levels[0]) && (level <= _levels[1]); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java index e6121878f9..247696f9a6 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java @@ -57,6 +57,6 @@ public class ConditionTargetMyPartyExceptMe extends Condition player.sendPacket(sm); isPartyMember = false; } - return (_val == isPartyMember); + return _val == isPartyMember; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java index 16505d58f6..8570ed65e4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java @@ -37,6 +37,6 @@ public class ConditionTargetNone extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - return (effected == null); + return effected == null; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java index 370641116f..5fe1a00191 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java @@ -29,6 +29,6 @@ public class ConditionTargetPlayable extends Condition @Override public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) { - return (effected instanceof L2Playable); + return effected instanceof L2Playable; } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java index ef0f064a43..a7a891ad6d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java +++ b/trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java @@ -46,7 +46,7 @@ public class ConditionTargetWeight extends Condition final L2PcInstance target = effected.getActingPlayer(); if (!target.getDietMode() && (target.getMaxLoad() > 0)) { - return ((((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()) < _weight); + return (((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()) < _weight; } } return false; diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java b/trunk/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java index f9c5aa9ee7..35a515d1ce 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/GroupedGeneralDropItem.java @@ -206,7 +206,7 @@ public final class GroupedGeneralDropItem implements IDropItem { if (applyKillerModifier) { - chanceModifier *= (getKillerChanceModifier(victim, killer)); + chanceModifier *= getKillerChanceModifier(victim, killer); } double sumchance = 0; for (GeneralDropItem item : getItems()) diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItem.java b/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItem.java index 28eb8765fc..c110afb8de 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItem.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItem.java @@ -32,5 +32,5 @@ public interface IDropItem * @param killer the killer * @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise */ - public List calculateDrops(L2Character victim, L2Character killer); + List calculateDrops(L2Character victim, L2Character killer); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItemFactory.java b/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItemFactory.java index e870e407fc..6c0f77962d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItemFactory.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/IDropItemFactory.java @@ -28,5 +28,5 @@ public interface IDropItemFactory * @param chance the chance of this drop item * @return the drop item created by this factory */ - public IDropItem newDropItem(int itemId, long min, long max, double chance); + IDropItem newDropItem(int itemId, long min, long max, double chance); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/IGroupedDropItemFactory.java b/trunk/java/com/l2jmobius/gameserver/model/drops/IGroupedDropItemFactory.java index e1e6095186..34e08542b6 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/IGroupedDropItemFactory.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/IGroupedDropItemFactory.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.drops; */ public interface IGroupedDropItemFactory { - public GroupedGeneralDropItem newGroupedDropItem(double chance); + GroupedGeneralDropItem newGroupedDropItem(double chance); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java index 3d07995d8f..acdfa573e0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java @@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IAmountMultiplierStrategy { - public static final IAmountMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER); - public static final IAmountMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER); - public static final IAmountMultiplierStrategy STATIC = (item, victim) -> 1; + IAmountMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_AMOUNT_MULTIPLIER); + IAmountMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_AMOUNT_MULTIPLIER); + IAmountMultiplierStrategy STATIC = (item, victim) -> 1; - public static IAmountMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier) + static IAmountMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier) { return (item, victim) -> { @@ -61,5 +61,5 @@ public interface IAmountMultiplierStrategy }; } - public double getAmountMultiplier(GeneralDropItem item, L2Character victim); + double getAmountMultiplier(GeneralDropItem item, L2Character victim); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java index 52a8d4d8be..04c1f6b269 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java @@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory; */ public interface IChanceMultiplierStrategy { - public static final IChanceMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER); - public static final IChanceMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER); - public static final IChanceMultiplierStrategy STATIC = (item, victim) -> 1; + IChanceMultiplierStrategy DROP = DEFAULT_STRATEGY(Config.RATE_DEATH_DROP_CHANCE_MULTIPLIER); + IChanceMultiplierStrategy SPOIL = DEFAULT_STRATEGY(Config.RATE_CORPSE_DROP_CHANCE_MULTIPLIER); + IChanceMultiplierStrategy STATIC = (item, victim) -> 1; - public static final IChanceMultiplierStrategy QUEST = (item, victim) -> + IChanceMultiplierStrategy QUEST = (item, victim) -> { double championmult; if ((item.getItemId() == Inventory.ADENA_ID) || (item.getItemId() == Inventory.ANCIENT_ADENA_ID)) @@ -46,7 +46,7 @@ public interface IChanceMultiplierStrategy return (Config.L2JMOD_CHAMPION_ENABLE && (victim != null) && victim.isChampion()) ? (Config.RATE_QUEST_DROP * championmult) : Config.RATE_QUEST_DROP; }; - public static IChanceMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier) + static IChanceMultiplierStrategy DEFAULT_STRATEGY(double defaultMultiplier) { return (item, victim) -> { @@ -76,5 +76,5 @@ public interface IChanceMultiplierStrategy }; } - public double getChanceMultiplier(GeneralDropItem item, L2Character victim); + double getChanceMultiplier(GeneralDropItem item, L2Character victim); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IDropCalculationStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IDropCalculationStrategy.java index 2cfaf5f38a..c516a86422 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IDropCalculationStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IDropCalculationStrategy.java @@ -29,7 +29,7 @@ import com.l2jmobius.util.Rnd; */ public interface IDropCalculationStrategy { - public static final IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) -> + IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) -> { final double chance = item.getChance(victim, killer); if (chance > (Rnd.nextDouble() * 100)) @@ -50,5 +50,5 @@ public interface IDropCalculationStrategy return null; }; - public List calculateDrops(GeneralDropItem item, L2Character victim, L2Character killer); + List calculateDrops(GeneralDropItem item, L2Character victim, L2Character killer); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java index 3f58b038ae..8d6648902a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java @@ -37,7 +37,7 @@ public interface IGroupedItemDropCalculationStrategy /** * The default strategy used in L2J to calculate drops. When the group's chance raises over 100% and group has precise calculation, the dropped item's amount increases. */ - public static final IGroupedItemDropCalculationStrategy DEFAULT_STRATEGY = new IGroupedItemDropCalculationStrategy() + IGroupedItemDropCalculationStrategy DEFAULT_STRATEGY = new IGroupedItemDropCalculationStrategy() { private final Map singleItemCache = new ConcurrentHashMap<>(); @@ -59,7 +59,7 @@ public interface IGroupedItemDropCalculationStrategy final GroupedGeneralDropItem normalized = dropItem.normalizeMe(victim, killer); if (normalized.getChance() > (Rnd.nextDouble() * 100)) { - final double random = (Rnd.nextDouble() * 100); + final double random = Rnd.nextDouble() * 100; double totalChance = 0; for (GeneralDropItem item2 : normalized.getItems()) { @@ -70,7 +70,7 @@ public interface IGroupedItemDropCalculationStrategy int amountMultiply = 1; if (dropItem.isPreciseCalculated() && (normalized.getChance() >= 100)) { - amountMultiply = (int) (normalized.getChance()) / 100; + amountMultiply = (int) normalized.getChance() / 100; if ((normalized.getChance() % 100) > (Rnd.nextDouble() * 100)) { amountMultiply++; @@ -88,7 +88,7 @@ public interface IGroupedItemDropCalculationStrategy /** * This strategy calculates a group's drop by calculating drops of its individual items and merging its results. */ - public static final IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) -> + IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) -> { final List dropped = new ArrayList<>(); for (IDropItem dropItem : item.extractMe()) @@ -101,7 +101,7 @@ public interface IGroupedItemDropCalculationStrategy /** * This strategy when group has precise calculation rolls multiple times over group to determine drops when group's chance raises over 100% instead of just multiplying the dropped item's amount. Thus it can produce different items from group at once. */ - public static final IGroupedItemDropCalculationStrategy PRECISE_MULTIPLE_GROUP_ROLLS = (item, victim, killer) -> + IGroupedItemDropCalculationStrategy PRECISE_MULTIPLE_GROUP_ROLLS = (item, victim, killer) -> { if (!item.isPreciseCalculated()) { @@ -126,5 +126,5 @@ public interface IGroupedItemDropCalculationStrategy return dropped.isEmpty() ? null : dropped; }; - public List calculateDrops(GroupedGeneralDropItem item, L2Character victim, L2Character killer); + List calculateDrops(GroupedGeneralDropItem item, L2Character victim, L2Character killer); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java index 0d04f886e8..57a4b583c9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.util.Util; */ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceModifierStrategy { - public static final IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) -> + IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) -> { final int levelDifference = victim.getLevel() - killer.getLevel(); if ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID) @@ -42,7 +42,7 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo } return 1; }; - public static final INonGroupedKillerChanceModifierStrategy DEFAULT_NONGROUP_STRATEGY = (item, victim, killer) -> + INonGroupedKillerChanceModifierStrategy DEFAULT_NONGROUP_STRATEGY = (item, victim, killer) -> { if (((!(victim.isRaid())) && Config.DEEPBLUE_DROP_RULES) || ((victim.isRaid()) && Config.DEEPBLUE_DROP_RULES_RAID)) { @@ -58,10 +58,10 @@ public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceMo IKillerChanceModifierStrategy NO_RULES = (item, victim, killer) -> 1; - public double getKillerChanceModifier(IDropItem item, L2Character victim, L2Character killer); + double getKillerChanceModifier(IDropItem item, L2Character victim, L2Character killer); @Override - public default double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer) + default double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer) { return getKillerChanceModifier((IDropItem) item, victim, killer); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java index 179e2ded04..be809ae392 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java @@ -24,5 +24,5 @@ import com.l2jmobius.gameserver.model.drops.GeneralDropItem; */ public interface INonGroupedKillerChanceModifierStrategy { - public double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer); + double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java index ded74e6ccf..76815ff3c5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java +++ b/trunk/java/com/l2jmobius/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java @@ -24,15 +24,15 @@ import com.l2jmobius.gameserver.model.drops.IDropItem; */ public interface IPreciseDeterminationStrategy { - public static final IPreciseDeterminationStrategy ALWAYS = dropItem -> true; + IPreciseDeterminationStrategy ALWAYS = dropItem -> true; - public static final IPreciseDeterminationStrategy DEFAULT = dropItem -> Config.PRECISE_DROP_CALCULATION; + IPreciseDeterminationStrategy DEFAULT = dropItem -> Config.PRECISE_DROP_CALCULATION; - public static final IPreciseDeterminationStrategy NEVER = dropItem -> false; + IPreciseDeterminationStrategy NEVER = dropItem -> false; /** * @param dropItem * @return true if drop calculation strategy should use precise rules */ - public boolean isPreciseCalculated(IDropItem dropItem); + boolean isPreciseCalculated(IDropItem dropItem); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/trunk/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 02c16b13f0..ab43023761 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/trunk/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -78,7 +78,7 @@ public abstract class AbstractEffect * @param params the parameters * @return the new effect */ - public static final AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) + public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) { final String name = set.getString("name"); final Class handler = EffectHandler.getInstance().getHandler(name); diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Auction.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Auction.java index 12dbd1e08b..5a79e09739 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Auction.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Auction.java @@ -411,12 +411,9 @@ public class Auction { returnItem(b.getClanName(), b.getBid(), true); // 10 % tax } - else + else if (L2World.getInstance().getPlayer(b.getName()) != null) { - if (L2World.getInstance().getPlayer(b.getName()) != null) - { - L2World.getInstance().getPlayer(b.getName()).sendMessage("Congratulation you have won ClanHall!"); - } + L2World.getInstance().getPlayer(b.getName()).sendMessage("Congratulation you have won ClanHall!"); } ClanTable.getInstance().getClanByName(b.getClanName()).setAuctionBiddedAt(0, true); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/trunk/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index 99175a8803..5cf32398a2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -535,7 +535,7 @@ public final class BlockCheckerEngine _redPoints += _numOfBoxes / 2; _bluePoints += _numOfBoxes / 2; - getHolder().broadCastPacketToTeam((new ExCubeGameChangePoints((int) ((getStarterTime() - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints()))); + getHolder().broadCastPacketToTeam(new ExCubeGameChangePoints((int) ((getStarterTime() - System.currentTimeMillis()) / 1000), getBluePoints(), getRedPoints())); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Castle.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Castle.java index 2770841eaa..700e6b1197 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Castle.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Castle.java @@ -335,16 +335,13 @@ public final class Castle extends AbstractResidence } _treasury -= amount; } + else if ((_treasury + amount) > Inventory.MAX_ADENA) + { + _treasury = Inventory.MAX_ADENA; + } else { - if ((_treasury + amount) > Inventory.MAX_ADENA) - { - _treasury = Inventory.MAX_ADENA; - } - else - { - _treasury += amount; - } + _treasury += amount; } try (Connection con = DatabaseFactory.getInstance().getConnection(); @@ -592,7 +589,7 @@ public final class Castle extends AbstractResidence if (door.isDead()) { door.doRevive(); - door.setCurrentHp((isDoorWeak) ? (door.getMaxHp() / 2) : (door.getMaxHp())); + door.setCurrentHp(isDoorWeak ? (door.getMaxHp() / 2) : door.getMaxHp()); } if (door.getOpen()) @@ -701,26 +698,20 @@ public final class Castle extends AbstractResidence { _function.put(type, new CastleFunction(type, lvl, lease, 0, rate, 0, false)); } + else if ((lvl == 0) && (lease == 0)) + { + removeFunction(type); + } + else if ((lease - _function.get(type).getLease()) > 0) + { + _function.remove(type); + _function.put(type, new CastleFunction(type, lvl, lease, 0, rate, -1, false)); + } else { - if ((lvl == 0) && (lease == 0)) - { - removeFunction(type); - } - else - { - if ((lease - _function.get(type).getLease()) > 0) - { - _function.remove(type); - _function.put(type, new CastleFunction(type, lvl, lease, 0, rate, -1, false)); - } - else - { - _function.get(type).setLease(lease); - _function.get(type).setLvl(lvl); - _function.get(type).dbSave(); - } - } + _function.get(type).setLease(lease); + _function.get(type).setLvl(lvl); + _function.get(type).dbSave(); } return true; } @@ -785,7 +776,7 @@ public final class Castle extends AbstractResidence public void setDoorUpgrade(int doorId, int ratio, boolean save) { - final L2DoorInstance door = (getDoors().isEmpty()) ? DoorData.getInstance().getDoor(doorId) : getDoor(doorId); + final L2DoorInstance door = getDoors().isEmpty() ? DoorData.getInstance().getDoor(doorId) : getDoor(doorId); if (door == null) { return; @@ -1126,7 +1117,7 @@ public final class Castle extends AbstractResidence public void giveResidentialSkills(L2PcInstance player) { super.giveResidentialSkills(player); - player.addSkill((getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill())); + player.addSkill(getSide() == CastleSide.DARK ? CommonSkill.ABILITY_OF_DARKNESS.getSkill() : CommonSkill.ABILITY_OF_LIGHT.getSkill()); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/ClanHall.java b/trunk/java/com/l2jmobius/gameserver/model/entity/ClanHall.java index f99e3ef17f..80d3969945 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/ClanHall.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/ClanHall.java @@ -488,26 +488,20 @@ public abstract class ClanHall { _functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, 0, false)); } + else if ((lvl == 0) && (lease == 0)) + { + removeFunction(type); + } + else if ((lease - _functions.get(type).getLease()) > 0) + { + _functions.remove(type); + _functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, -1, false)); + } else { - if ((lvl == 0) && (lease == 0)) - { - removeFunction(type); - } - else - { - if ((lease - _functions.get(type).getLease()) > 0) - { - _functions.remove(type); - _functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, -1, false)); - } - else - { - _functions.get(type).setLease(lease); - _functions.get(type).setLvl(lvl); - _functions.get(type).dbSave(); - } - } + _functions.get(type).setLease(lease); + _functions.get(type).setLvl(lvl); + _functions.get(type).dbSave(); } return true; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Fort.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Fort.java index ee4a76aa2d..c16fdc76d0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Fort.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Fort.java @@ -582,7 +582,7 @@ public final class Fort extends AbstractResidence long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis(); while (initial > (Config.FS_UPDATE_FRQ * 60000L)) { - initial -= (Config.FS_UPDATE_FRQ * 60000L); + initial -= Config.FS_UPDATE_FRQ * 60000L; } initial = (Config.FS_UPDATE_FRQ * 60000L) - initial; if ((Config.FS_MAX_OWN_TIME <= 0) || (getOwnedTime() < (Config.FS_MAX_OWN_TIME * 3600))) @@ -675,26 +675,20 @@ public final class Fort extends AbstractResidence { _function.put(type, new FortFunction(type, lvl, lease, 0, rate, 0, false)); } + else if ((lvl == 0) && (lease == 0)) + { + removeFunction(type); + } + else if ((lease - _function.get(type).getLease()) > 0) + { + _function.remove(type); + _function.put(type, new FortFunction(type, lvl, lease, 0, rate, -1, false)); + } else { - if ((lvl == 0) && (lease == 0)) - { - removeFunction(type); - } - else - { - if ((lease - _function.get(type).getLease()) > 0) - { - _function.remove(type); - _function.put(type, new FortFunction(type, lvl, lease, 0, rate, -1, false)); - } - else - { - _function.get(type).setLease(lease); - _function.get(type).setLvl(lvl); - _function.get(type).dbSave(); - } - } + _function.get(type).setLease(lease); + _function.get(type).setLvl(lvl); + _function.get(type).dbSave(); } return true; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/FortSiege.java b/trunk/java/com/l2jmobius/gameserver/model/entity/FortSiege.java index 4a7e2d34fe..f2fad0396e 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/FortSiege.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/FortSiege.java @@ -464,7 +464,7 @@ public class FortSiege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege + return isInProgress() && getFort().checkIfInZone(x, y, z); // Fort zone during siege } /** @@ -474,7 +474,7 @@ public class FortSiege implements Siegable @Override public boolean checkIsAttacker(L2Clan clan) { - return (getAttackerClan(clan) != null); + return getAttackerClan(clan) != null; } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Hero.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Hero.java index a62ade5117..e26bbc2934 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Hero.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Hero.java @@ -460,7 +460,7 @@ public class Hero final StringBuilder fList = new StringBuilder(500); int counter = 0; int breakat = 0; - for (int i = ((page - 1) * perpage); i < list.size(); i++) + for (int i = (page - 1) * perpage; i < list.size(); i++) { breakat = i; final StatsSet diaryEntry = list.get(i); @@ -548,7 +548,7 @@ public class Hero final StringBuilder fList = new StringBuilder(500); int counter = 0; int breakat = 0; - for (int i = ((page - 1) * perpage); i < heroFights.size(); i++) + for (int i = (page - 1) * perpage; i < heroFights.size(); i++) { breakat = i; final StatsSet fight = heroFights.get(i); diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Instance.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Instance.java index 37750b876d..2a84e5dd3a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Instance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Instance.java @@ -638,13 +638,13 @@ public final class Instance spawnDat.startRespawn(); } spawnDat.setInstanceId(getId()); - if (allowRandomWalk == null) + if (allowRandomWalk != null) { - spawnDat.setIsNoRndWalk(!_allowRandomWalk); + spawnDat.setIsNoRndWalk(!allowRandomWalk); } else { - spawnDat.setIsNoRndWalk(!allowRandomWalk); + spawnDat.setIsNoRndWalk(!_allowRandomWalk); } spawnDat.setAreaName(areaName); @@ -887,7 +887,7 @@ public final class Instance public void addEjectDeadTask(L2PcInstance player) { - if ((player != null)) + if (player != null) { _ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneral(() -> { diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/L2Event.java b/trunk/java/com/l2jmobius/gameserver/model/entity/L2Event.java index 18b029924b..c3ff34db5f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/L2Event.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/L2Event.java @@ -541,7 +541,7 @@ public class L2Event return "The event has been successfully finished."; } - private static final Map sortByValue(Map unsortMap) + private static Map sortByValue(Map unsortMap) { final List> list = new LinkedList<>(unsortMap.entrySet()); diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Message.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Message.java index 3ae18fd2b4..76d9cbb28b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Message.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Message.java @@ -106,7 +106,7 @@ public class Message _receiverId = receiverId; _subject = subject; _content = text; - _expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000)); + _expiration = isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000); _hasAttachments = false; _unread = true; _deletedBySender = false; @@ -214,7 +214,7 @@ public class Message } } - public static final PreparedStatement getStatement(Message msg, Connection con) throws SQLException + public static PreparedStatement getStatement(Message msg, Connection con) throws SQLException { final PreparedStatement stmt = con.prepareStatement("INSERT INTO messages (messageId, senderId, receiverId, subject, content, expiration, reqAdena, hasAttachments, isUnread, isDeletedBySender, isDeletedByReceiver, sendBySystem, isReturned, itemId, enchantLvl, elementals) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"); diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Siegable.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Siegable.java index 7a5532a4a1..49e78a2b00 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Siegable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Siegable.java @@ -29,37 +29,37 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; */ public interface Siegable { - public void startSiege(); + void startSiege(); - public void endSiege(); + void endSiege(); - public L2SiegeClan getAttackerClan(int clanId); + L2SiegeClan getAttackerClan(int clanId); - public L2SiegeClan getAttackerClan(L2Clan clan); + L2SiegeClan getAttackerClan(L2Clan clan); - public List getAttackerClans(); + List getAttackerClans(); - public List getAttackersInZone(); + List getAttackersInZone(); - public boolean checkIsAttacker(L2Clan clan); + boolean checkIsAttacker(L2Clan clan); - public L2SiegeClan getDefenderClan(int clanId); + L2SiegeClan getDefenderClan(int clanId); - public L2SiegeClan getDefenderClan(L2Clan clan); + L2SiegeClan getDefenderClan(L2Clan clan); - public List getDefenderClans(); + List getDefenderClans(); - public boolean checkIsDefender(L2Clan clan); + boolean checkIsDefender(L2Clan clan); - public List getFlag(L2Clan clan); + List getFlag(L2Clan clan); - public Calendar getSiegeDate(); + Calendar getSiegeDate(); - public boolean giveFame(); + boolean giveFame(); - public int getFameFrequency(); + int getFameFrequency(); - public int getFameAmount(); + int getFameAmount(); - public void updateSiege(); + void updateSiege(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/Siege.java b/trunk/java/com/l2jmobius/gameserver/model/entity/Siege.java index db3259cea8..e5f5dd45bb 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/Siege.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/Siege.java @@ -721,7 +721,7 @@ public class Siege implements Siegable */ public boolean checkIfInZone(int x, int y, int z) { - return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege + return isInProgress() && getCastle().checkIfInZone(x, y, z); // Castle zone during siege } /** @@ -732,7 +732,7 @@ public class Siege implements Siegable @Override public boolean checkIsAttacker(L2Clan clan) { - return (getAttackerClan(clan) != null); + return getAttackerClan(clan) != null; } /** @@ -743,7 +743,7 @@ public class Siege implements Siegable @Override public boolean checkIsDefender(L2Clan clan) { - return (getDefenderClan(clan) != null); + return getDefenderClan(clan) != null; } /** @@ -752,7 +752,7 @@ public class Siege implements Siegable */ public boolean checkIsDefenderWaiting(L2Clan clan) { - return (getDefenderWaitingClan(clan) != null); + return getDefenderWaitingClan(clan) != null; } /** Clear all registered siege clans from database for castle */ @@ -1420,12 +1420,9 @@ public class Siege implements Siegable return; } } - else + else if (getAttackerClans().size() >= SiegeManager.getInstance().getAttackerMaxClans()) { - if (getAttackerClans().size() >= SiegeManager.getInstance().getAttackerMaxClans()) - { - return; - } + return; } if (!isUpdateRegistration) @@ -1615,7 +1612,7 @@ public class Siege implements Siegable public final int getAttackerRespawnDelay() { - return (SiegeManager.getInstance().getAttackerRespawnDelay()); + return SiegeManager.getInstance().getAttackerRespawnDelay(); } public final Castle getCastle() diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/trunk/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java index 4e7c276419..c70c9ad911 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -484,7 +484,7 @@ public class TvTEvent // Check to which team the player should be added if (_teams[0].getParticipatedPlayerCount() == _teams[1].getParticipatedPlayerCount()) { - teamId = (byte) (Rnd.get(2)); + teamId = (byte) Rnd.get(2); } else { @@ -889,17 +889,14 @@ public class TvTEvent } } } - else + else if ((Config.TVT_EVENT_FIGHTER_BUFFS != null) && !Config.TVT_EVENT_FIGHTER_BUFFS.isEmpty()) { - if ((Config.TVT_EVENT_FIGHTER_BUFFS != null) && !Config.TVT_EVENT_FIGHTER_BUFFS.isEmpty()) + for (Entry e : Config.TVT_EVENT_FIGHTER_BUFFS.entrySet()) { - for (Entry e : Config.TVT_EVENT_FIGHTER_BUFFS.entrySet()) + final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); + if (skill != null) { - final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue()); - if (skill != null) - { - skill.applyEffects(playerInstance, playerInstance); - } + skill.applyEffects(playerInstance, playerInstance); } } } @@ -911,7 +908,7 @@ public class TvTEvent * @param skill * @return true if player valid for skill */ - public static final boolean checkForTvTSkill(L2PcInstance source, L2PcInstance target, Skill skill) + public static boolean checkForTvTSkill(L2PcInstance source, L2PcInstance target, Skill skill) { if (!isStarted()) { @@ -1073,7 +1070,7 @@ public class TvTEvent */ public static TvTEventTeam getParticipantTeam(int playerObjectId) { - return (_teams[0].containsPlayer(playerObjectId) ? _teams[0] : (_teams[1].containsPlayer(playerObjectId) ? _teams[1] : null)); + return _teams[0].containsPlayer(playerObjectId) ? _teams[0] : (_teams[1].containsPlayer(playerObjectId) ? _teams[1] : null); } /** @@ -1083,7 +1080,7 @@ public class TvTEvent */ public static TvTEventTeam getParticipantEnemyTeam(int playerObjectId) { - return (_teams[0].containsPlayer(playerObjectId) ? _teams[1] : (_teams[1].containsPlayer(playerObjectId) ? _teams[0] : null)); + return _teams[0].containsPlayer(playerObjectId) ? _teams[1] : (_teams[1].containsPlayer(playerObjectId) ? _teams[0] : null); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/TvTManager.java b/trunk/java/com/l2jmobius/gameserver/model/entity/TvTManager.java index ea7d67de97..1f84e19a18 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/TvTManager.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/TvTManager.java @@ -229,21 +229,18 @@ public class TvTManager { nextMsg = delay; } + // start + else if (TvTEvent.isInactive()) + { + startReg(); + } + else if (TvTEvent.isParticipating()) + { + startEvent(); + } else { - // start - if (TvTEvent.isInactive()) - { - startReg(); - } - else if (TvTEvent.isParticipating()) - { - startEvent(); - } - else - { - endEvent(); - } + endEvent(); } if (delay > 0) @@ -276,16 +273,13 @@ public class TvTManager TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60) + " minute(s) until the event is finished!"); } } - else + else if (TvTEvent.isParticipating()) { - if (TvTEvent.isParticipating()) - { - Broadcast.toAllOnlinePlayers("TvT Event: " + time + " second(s) until registration is closed!"); - } - else if (TvTEvent.isStarted()) - { - TvTEvent.sysMsgToAllParticipants("TvT Event: " + time + " second(s) until the event is finished!"); - } + Broadcast.toAllOnlinePlayers("TvT Event: " + time + " second(s) until registration is closed!"); + } + else if (TvTEvent.isStarted()) + { + TvTEvent.sysMsgToAllParticipants("TvT Event: " + time + " second(s) until the event is finished!"); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java index b1b7143d3a..7879d440fa 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/AuctionableHall.java @@ -220,7 +220,7 @@ public final class AuctionableHall extends ClanHall { ps.setInt(1, getOwnerId()); ps.setLong(2, getPaidUntil()); - ps.setInt(3, (getPaid()) ? 1 : 0); + ps.setInt(3, getPaid() ? 1 : 0); ps.setInt(4, getId()); ps.execute(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java index 4b6101876f..d4fdc39a83 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java +++ b/trunk/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java @@ -100,7 +100,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable while (rset.next()) { final int id = rset.getInt("attacker_id"); - _attackers.put(id, (new L2SiegeClan(id, SiegeClanType.ATTACKER))); + _attackers.put(id, new L2SiegeClan(id, SiegeClanType.ATTACKER)); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java b/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java index c41294bedf..7ee019a566 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/AbstractScript.java @@ -1911,7 +1911,7 @@ public abstract class AbstractScript implements INamable } if (checkCount) { - return (getQuestItemsCount(player, item.getId()) >= item.getCount()); + return getQuestItemsCount(player, item.getId()) >= item.getCount(); } return hasQuestItems(player, item.getId()); } @@ -1948,7 +1948,7 @@ public abstract class AbstractScript implements INamable */ public static boolean hasQuestItems(L2PcInstance player, int itemId) { - return (player.getInventory().getItemByItemId(itemId) != null); + return player.getInventory().getItemByItemId(itemId) != null; } /** @@ -2002,11 +2002,11 @@ public abstract class AbstractScript implements INamable public static int getEnchantLevel(L2PcInstance player, int itemId) { final L2ItemInstance enchantedItem = player.getInventory().getItemByItemId(itemId); - if (enchantedItem == null) + if (enchantedItem != null) { - return 0; + return enchantedItem.getEnchantLevel(); } - return enchantedItem.getEnchantLevel(); + return 0; } /** @@ -2133,19 +2133,16 @@ public abstract class AbstractScript implements INamable smsg.addLong(count); } // Otherwise, send message of object reward to client + else if (count > 1) + { + smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); + smsg.addItemName(item); + smsg.addLong(count); + } else { - if (count > 1) - { - smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S); - smsg.addItemName(item); - smsg.addLong(count); - } - else - { - smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); - smsg.addItemName(item); - } + smsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1); + smsg.addItemName(item); } // send packets player.sendPacket(smsg); @@ -2315,7 +2312,7 @@ public abstract class AbstractScript implements INamable } } - long amountToGive = ((minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount)); + long amountToGive = (minAmount == maxAmount) ? minAmount : Rnd.get(minAmount, maxAmount); final double random = Rnd.nextDouble(); // Inventory slot check (almost useless for non-stacking items) if ((dropChance >= random) && (amountToGive > 0) && player.getInventory().validateCapacityByItemId(itemId)) @@ -2769,7 +2766,7 @@ public abstract class AbstractScript implements INamable if (equaldist >= maxGive) { toGive = maxGive; - randomdist += (equaldist - maxGive); // overflown items are available to next players + randomdist += equaldist - maxGive; // overflown items are available to next players it.remove(); // this player is already full } rewardedCounts.get(player).put(item.getId(), rewardedCounts.get(player).get(item.getId()) + toGive); @@ -3274,7 +3271,7 @@ public abstract class AbstractScript implements INamable * @param isWide * @param relAngle */ - public static final void specialCamera(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle) + public static void specialCamera(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle) { player.sendPacket(new SpecialCamera(creature, force, angle1, angle2, time, range, duration, relYaw, relPitch, isWide, relAngle)); } @@ -3293,7 +3290,7 @@ public abstract class AbstractScript implements INamable * @param isWide * @param relAngle */ - public static final void specialCameraEx(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int duration, int relYaw, int relPitch, int isWide, int relAngle) + public static void specialCameraEx(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int duration, int relYaw, int relPitch, int isWide, int relAngle) { player.sendPacket(new SpecialCamera(creature, player, force, angle1, angle2, time, duration, relYaw, relPitch, isWide, relAngle)); } @@ -3314,7 +3311,7 @@ public abstract class AbstractScript implements INamable * @param relAngle * @param unk */ - public static final void specialCamera3(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle, int unk) + public static void specialCamera3(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle, int unk) { player.sendPacket(new SpecialCamera(creature, force, angle1, angle2, time, range, duration, relYaw, relPitch, isWide, relAngle, unk)); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java b/trunk/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java index 188713628a..24e03cbce7 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/ListenersContainer.java @@ -39,7 +39,7 @@ public class ListenersContainer */ public AbstractEventListener addListener(AbstractEventListener listener) { - if ((listener == null)) + if (listener == null) { throw new NullPointerException("Listener cannot be null!"); } @@ -54,7 +54,7 @@ public class ListenersContainer */ public AbstractEventListener removeListener(AbstractEventListener listener) { - if ((listener == null)) + if (listener == null) { throw new NullPointerException("Listener cannot be null!"); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Id.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Id.java index 01a6762cbf..de0cec4749 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Id.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Id.java @@ -30,5 +30,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface Id { - public int[] value(); + int[] value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ids.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ids.java index e3bd54cd6a..d64c781985 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ids.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ids.java @@ -28,5 +28,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface Ids { - public Id[] value(); + Id[] value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRange.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRange.java index 9d0b4688bb..6ad28e1236 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRange.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRange.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface NpcLevelRange { - public int from(); + int from(); - public int to(); + int to(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRanges.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRanges.java index ab1c202fd4..427312b2e1 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRanges.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/NpcLevelRanges.java @@ -28,5 +28,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface NpcLevelRanges { - public NpcLevelRange[] value(); + NpcLevelRange[] value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Priority.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Priority.java index 7462712f69..6bcc4c4bab 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Priority.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Priority.java @@ -28,5 +28,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface Priority { - public int value() default 0; + int value() default 0; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Range.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Range.java index f858e2f0d7..a97e12937f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Range.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Range.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface Range { - public int from(); + int from(); - public int to(); + int to(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ranges.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ranges.java index e796011da7..560c5cfa45 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ranges.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/Ranges.java @@ -28,5 +28,5 @@ import java.lang.annotation.Target; @Target(ElementType.METHOD) public @interface Ranges { - public Range[] value(); + Range[] value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterEvent.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterEvent.java index c6c57ff6e3..583c02fd5e 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterEvent.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterEvent.java @@ -30,5 +30,5 @@ import com.l2jmobius.gameserver.model.events.EventType; @Target(ElementType.METHOD) public @interface RegisterEvent { - public EventType value(); + EventType value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterType.java b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterType.java index 3f292f0535..5f28a4bd4d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterType.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/annotations/RegisterType.java @@ -30,5 +30,5 @@ import com.l2jmobius.gameserver.model.events.ListenerRegisterType; @Target(ElementType.METHOD) public @interface RegisterType { - public ListenerRegisterType value(); + ListenerRegisterType value(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/events/impl/IBaseEvent.java b/trunk/java/com/l2jmobius/gameserver/model/events/impl/IBaseEvent.java index cf3fdff5f1..4e09ed6c56 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/events/impl/IBaseEvent.java +++ b/trunk/java/com/l2jmobius/gameserver/model/events/impl/IBaseEvent.java @@ -23,5 +23,5 @@ import com.l2jmobius.gameserver.model.events.EventType; */ public interface IBaseEvent { - public EventType getType(); + EventType getType(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java b/trunk/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java index 9217e2274e..449918ecd0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java +++ b/trunk/java/com/l2jmobius/gameserver/model/fishing/L2Fishing.java @@ -88,15 +88,15 @@ public class L2Fishing implements Runnable final int lureType; if (isUpperGrade) { - _deceptiveMode = ((Rnd.get(100) >= 90) ? 1 : 0); + _deceptiveMode = (Rnd.get(100) >= 90) ? 1 : 0; lureType = 2; } else { _deceptiveMode = 0; - lureType = (isNoob ? 0 : 1); + lureType = isNoob ? 0 : 1; } - _mode = ((Rnd.get(100) >= 80) ? 1 : 0); + _mode = (Rnd.get(100) >= 80) ? 1 : 0; _fisher.broadcastPacket(new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, lureType, _deceptiveMode)); _fisher.sendPacket(new PlaySound(1, "SF_S_01", 0, 0, 0, 0, 0)); @@ -189,12 +189,9 @@ public class L2Fishing implements Runnable _fishCurHp += (int) _regenHp; } } - else + else if (_deceptiveMode == 1) { - if (_deceptiveMode == 1) - { - _fishCurHp += (int) _regenHp; - } + _fishCurHp += (int) _regenHp; } if (_stop == 0) { @@ -274,32 +271,29 @@ public class L2Fishing implements Runnable changeHp(-dmg, pen); } } + else if (_deceptiveMode == 0) + { + // Reeling failed, Damage: $s1 + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); + sm.addInt(dmg); + _fisher.sendPacket(sm); + _goodUse = 2; + changeHp(-dmg, pen); + } else { - if (_deceptiveMode == 0) + // Reeling is successful, Damage: $s1 + SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_REEL_THAT_FISH_IN_CLOSER_AND_CAUSE_S1_DAMAGE); + sm.addInt(dmg); + _fisher.sendPacket(sm); + if (pen > 0) { - // Reeling failed, Damage: $s1 - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_REEL_THAT_FISH_IN_FURTHER_AND_IT_REGAINS_S1_HP); - sm.addInt(dmg); + sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_MASTERY_PENALTY_S1); + sm.addInt(pen); _fisher.sendPacket(sm); - _goodUse = 2; - changeHp(-dmg, pen); - } - else - { - // Reeling is successful, Damage: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_REEL_THAT_FISH_IN_CLOSER_AND_CAUSE_S1_DAMAGE); - sm.addInt(dmg); - _fisher.sendPacket(sm); - if (pen > 0) - { - sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_MASTERY_PENALTY_S1); - sm.addInt(pen); - _fisher.sendPacket(sm); - } - _goodUse = 1; - changeHp(dmg, pen); } + _goodUse = 1; + changeHp(dmg, pen); } } @@ -344,32 +338,29 @@ public class L2Fishing implements Runnable changeHp(-dmg, pen); } } + else if (_deceptiveMode == 0) + { + // Pumping failed, Regained: $s1 + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); + sm.addInt(dmg); + _fisher.sendPacket(sm); + _goodUse = 2; + changeHp(-dmg, pen); + } else { - if (_deceptiveMode == 0) + // Pumping is successful. Damage: $s1 + SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PUMPING_IS_SUCCESSFUL_CAUSING_S1_DAMAGE); + sm.addInt(dmg); + _fisher.sendPacket(sm); + if (pen > 0) { - // Pumping failed, Regained: $s1 - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_FAILED_TO_DO_ANYTHING_WITH_THE_FISH_AND_IT_REGAINS_S1_HP); - sm.addInt(dmg); + sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_MASTERY_PENALTY_S1); + sm.addInt(pen); _fisher.sendPacket(sm); - _goodUse = 2; - changeHp(-dmg, pen); - } - else - { - // Pumping is successful. Damage: $s1 - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PUMPING_IS_SUCCESSFUL_CAUSING_S1_DAMAGE); - sm.addInt(dmg); - _fisher.sendPacket(sm); - if (pen > 0) - { - sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_MASTERY_PENALTY_S1); - sm.addInt(pen); - _fisher.sendPacket(sm); - } - _goodUse = 1; - changeHp(dmg, pen); } + _goodUse = 1; + changeHp(dmg, pen); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/holders/NpcRoutesHolder.java b/trunk/java/com/l2jmobius/gameserver/model/holders/NpcRoutesHolder.java index 68e0726249..427b3585d9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/holders/NpcRoutesHolder.java +++ b/trunk/java/com/l2jmobius/gameserver/model/holders/NpcRoutesHolder.java @@ -66,6 +66,6 @@ public final class NpcRoutesHolder */ private String getUniqueKey(ILocational loc) { - return (loc.getX() + "-" + loc.getY() + "-" + loc.getZ()); + return loc.getX() + "-" + loc.getY() + "-" + loc.getZ(); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDecayable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDecayable.java index 6c63f19c2f..31a1848441 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDecayable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDecayable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IDecayable { - public boolean decayMe(); + boolean decayMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDeletable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDeletable.java index 1fbd172ea3..a1062b7a36 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDeletable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IDeletable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IDeletable { - public boolean deleteMe(); + boolean deleteMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IEventListener.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IEventListener.java index 47e949b3f4..661e639527 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IEventListener.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IEventListener.java @@ -26,22 +26,22 @@ public interface IEventListener /** * @return {@code true} if player is on event, {@code false} otherwise. */ - public boolean isOnEvent(); + boolean isOnEvent(); /** * @return {@code true} if player is blocked from leaving the game, {@code false} otherwise. */ - public boolean isBlockingExit(); + boolean isBlockingExit(); /** * @return {@code true} if player is blocked from receiving death penalty upon death, {@code false} otherwise. */ - public boolean isBlockingDeathPenalty(); + boolean isBlockingDeathPenalty(); /** * @return {@code true} if player can revive after death, {@code false} otherwise. */ - public boolean canRevive(); + boolean canRevive(); - public L2PcInstance getPlayer(); + L2PcInstance getPlayer(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IIdentifiable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IIdentifiable.java index 0409f14273..45568d6ab5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IIdentifiable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IIdentifiable.java @@ -22,5 +22,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IIdentifiable { - public int getId(); + int getId(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java index 0faf08144b..3e9eaacb5c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ILocational.java @@ -26,35 +26,35 @@ public interface ILocational * Gets the X coordinate of this object. * @return the X coordinate */ - public int getX(); + int getX(); /** * Gets the Y coordinate of this object. * @return the current Y coordinate */ - public int getY(); + int getY(); /** * Gets the Z coordinate of this object. * @return the current Z coordinate */ - public int getZ(); + int getZ(); /** * Gets the heading of this object. * @return the current heading */ - public int getHeading(); + int getHeading(); /** * Gets the instance zone ID of this object. * @return the ID of the instance zone this object is currently in (0 - not in any instance) */ - public int getInstanceId(); + int getInstanceId(); /** * Gets this object's location. * @return a {@link ILocational} object containing the current position of this object */ - public ILocational getLocation(); + ILocational getLocation(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/INamable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/INamable.java index 52ebf49c2e..90f609ee1b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/INamable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/INamable.java @@ -22,5 +22,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface INamable { - public String getName(); + String getName(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserAdvUtils.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserAdvUtils.java index 007f2f2956..75ef5c6954 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserAdvUtils.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserAdvUtils.java @@ -25,24 +25,24 @@ import java.time.Duration; */ public interface IParserAdvUtils extends IParserUtils { - public boolean getBoolean(String key); + boolean getBoolean(String key); - public byte getByte(String key); + byte getByte(String key); - public short getShort(String key); + short getShort(String key); - public int getInt(String key); + int getInt(String key); - public long getLong(String key); + long getLong(String key); - public float getFloat(String key); + float getFloat(String key); - public double getDouble(String key); + double getDouble(String key); - public String getString(String key); + String getString(String key); - public Duration getDuration(String key); + Duration getDuration(String key); - public > T getEnum(String key, Class clazz); + > T getEnum(String key, Class clazz); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserUtils.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserUtils.java index 9f374dfe02..6a53ed771d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserUtils.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IParserUtils.java @@ -25,23 +25,23 @@ import java.time.Duration; */ public interface IParserUtils { - public boolean getBoolean(String key, boolean defaultValue); + boolean getBoolean(String key, boolean defaultValue); - public byte getByte(String key, byte defaultValue); + byte getByte(String key, byte defaultValue); - public short getShort(String key, short defaultValue); + short getShort(String key, short defaultValue); - public int getInt(String key, int defaultValue); + int getInt(String key, int defaultValue); - public long getLong(String key, long defaultValue); + long getLong(String key, long defaultValue); - public float getFloat(String key, float defaultValue); + float getFloat(String key, float defaultValue); - public double getDouble(String key, double defaultValue); + double getDouble(String key, double defaultValue); - public String getString(String key, String defaultValue); + String getString(String key, String defaultValue); - public Duration getDuration(String key, Duration defaultValue); + Duration getDuration(String key, Duration defaultValue); - public > T getEnum(String key, Class clazz, T defaultValue); + > T getEnum(String key, Class clazz, T defaultValue); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java index 8660c6462b..6b9f2a6728 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IPositionable.java @@ -28,19 +28,19 @@ public interface IPositionable extends ILocational * Sets the X coordinate of this object. * @param x the new X coordinate */ - public void setX(int x); + void setX(int x); /** * Sets the Y coordinate of this object. * @param y the new Y coordinate */ - public void setY(int y); + void setY(int y); /** * Sets the Z coordinate of this object. * @param z the new Z coordinate */ - public void setZ(int z); + void setZ(int z); /** * Sets all three coordinates of this object. @@ -48,29 +48,29 @@ public interface IPositionable extends ILocational * @param y the new Y coordinate * @param z the new Z coordinate */ - public void setXYZ(int x, int y, int z); + void setXYZ(int x, int y, int z); /** * Sets all three coordinates of this object. * @param loc the object whose coordinates to use */ - public void setXYZ(ILocational loc); + void setXYZ(ILocational loc); /** * Sets the heading of this object. * @param heading the new heading */ - public void setHeading(int heading); + void setHeading(int heading); /** * Changes the instance zone ID of this object. * @param instanceId the ID of the instance zone to put this object in (0 - not in any instance) */ - public void setInstanceId(int instanceId); + void setInstanceId(int instanceId); /** * Changes the location of this object. * @param loc the new location */ - public void setLocation(Location loc); + void setLocation(Location loc); } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IRestorable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IRestorable.java index a87d8d1a10..267e1ecf4a 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IRestorable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IRestorable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IRestorable { - public boolean restoreMe(); + boolean restoreMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISkillsHolder.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISkillsHolder.java index 8346e87b9b..89ed100a4c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISkillsHolder.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISkillsHolder.java @@ -25,11 +25,11 @@ import com.l2jmobius.gameserver.model.skills.Skill; */ public interface ISkillsHolder { - public Map getSkills(); + Map getSkills(); - public Skill addSkill(Skill skill); + Skill addSkill(Skill skill); - public Skill getKnownSkill(int skillId); + Skill getKnownSkill(int skillId); - public int getSkillLevel(int skillId); + int getSkillLevel(int skillId); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISpawnable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISpawnable.java index dd50dc5d24..d8a0605e7b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISpawnable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/ISpawnable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface ISpawnable { - public boolean spawnMe(); + boolean spawnMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IStorable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IStorable.java index bb30765b34..2cf65ad4d0 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IStorable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IStorable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IStorable { - public boolean storeMe(); + boolean storeMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUniqueId.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUniqueId.java index 5d4d5645b2..8265ae25df 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUniqueId.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUniqueId.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IUniqueId { - public int getObjectId(); + int getObjectId(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdatable.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdatable.java index febac09415..61969bc81d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdatable.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdatable.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IUpdatable { - public boolean updateMe(); + boolean updateMe(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdateTypeComponent.java b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdateTypeComponent.java index 5f5e316bde..20fa038ac2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdateTypeComponent.java +++ b/trunk/java/com/l2jmobius/gameserver/model/interfaces/IUpdateTypeComponent.java @@ -21,5 +21,5 @@ package com.l2jmobius.gameserver.model.interfaces; */ public interface IUpdateTypeComponent { - public int getMask(); + int getMask(); } diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java b/trunk/java/com/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java index a6dad0a25d..205e4cfe1f 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemauction/AuctionDateGenerator.java @@ -55,7 +55,7 @@ public final class AuctionDateGenerator checkMinuteOfHour(0); } - public synchronized final long nextDate(long date) + public final synchronized long nextDate(long date) { _calendar.setTimeInMillis(date); _calendar.set(Calendar.MILLISECOND, 0); diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 2f3f3960fe..0f44250c68 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -595,7 +595,7 @@ public final class ItemAuctionInstance { while (rs.next()) { - auctionBids.add((new ItemAuctionBid(rs.getInt(1), rs.getLong(2)))); + auctionBids.add(new ItemAuctionBid(rs.getInt(1), rs.getLong(2))); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionState.java b/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionState.java index 7c2f914b76..cbffdfbe15 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionState.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionState.java @@ -37,7 +37,7 @@ public enum ItemAuctionState return _stateId; } - public static final ItemAuctionState stateForStateId(byte stateId) + public static ItemAuctionState stateForStateId(byte stateId) { for (ItemAuctionState state : ItemAuctionState.values()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 6e9c537112..a05bd97d24 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -76,7 +76,7 @@ public final class ClanWarehouse extends Warehouse @Override public boolean validateCapacity(long slots) { - return ((_items.size() + slots) <= Config.WAREHOUSE_SLOTS_CLAN); + return (_items.size() + slots) <= Config.WAREHOUSE_SLOTS_CLAN; } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 14e9257055..79b2a4be1d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -55,9 +55,9 @@ public abstract class Inventory extends ItemContainer public interface PaperdollListener { - public void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory); + void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory); - public void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory); + void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory); } // Common Items @@ -1771,7 +1771,7 @@ public abstract class Inventory extends ItemContainer case L2Item.SLOT_L_HAND: { final L2ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND); - if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND) && !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) + if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND) && ((rh.getItemType() != WeaponType.BOW) || (item.getItemType() != EtcItemType.ARROW)) && ((rh.getItemType() != WeaponType.CROSSBOW) || (item.getItemType() != EtcItemType.BOLT)) && ((rh.getItemType() != WeaponType.FISHINGROD) || (item.getItemType() != EtcItemType.LURE))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -1793,13 +1793,13 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_LEAR, item); } - else if (_paperdoll[PAPERDOLL_REAR] == null) + else if (_paperdoll[PAPERDOLL_REAR] != null) { - setPaperdollItem(PAPERDOLL_REAR, item); + setPaperdollItem(PAPERDOLL_LEAR, item); } else { - setPaperdollItem(PAPERDOLL_LEAR, item); + setPaperdollItem(PAPERDOLL_REAR, item); } break; } @@ -1811,13 +1811,13 @@ public abstract class Inventory extends ItemContainer { setPaperdollItem(PAPERDOLL_LFINGER, item); } - else if (_paperdoll[PAPERDOLL_RFINGER] == null) + else if (_paperdoll[PAPERDOLL_RFINGER] != null) { - setPaperdollItem(PAPERDOLL_RFINGER, item); + setPaperdollItem(PAPERDOLL_LFINGER, item); } else { - setPaperdollItem(PAPERDOLL_LFINGER, item); + setPaperdollItem(PAPERDOLL_RFINGER, item); } break; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index a94ea94bbd..ad1611d36c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -105,7 +105,7 @@ public abstract class ItemContainer { for (L2ItemInstance item : _items) { - if ((item != null) && (item.getItem().isAllowSelfResurrection())) + if ((item != null) && item.getItem().isAllowSelfResurrection()) { return true; } @@ -254,7 +254,7 @@ public abstract class ItemContainer { item.setOwnerId(process, getOwnerId(), actor, reference); item.setItemLocation(getBaseLocation()); - item.setLastChange((L2ItemInstance.ADDED)); + item.setLastChange(L2ItemInstance.ADDED); // Add item in inventory addItem(item); @@ -490,7 +490,7 @@ public abstract class ItemContainer */ public L2ItemInstance destroyItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) { - return this.destroyItem(process, item, item.getCount(), actor, reference); + return destroyItem(process, item, item.getCount(), actor, reference); } /** @@ -553,7 +553,7 @@ public abstract class ItemContainer public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) { final L2ItemInstance item = getItemByObjectId(objectId); - return item == null ? null : this.destroyItem(process, item, count, actor, reference); + return item == null ? null : destroyItem(process, item, count, actor, reference); } /** @@ -704,7 +704,7 @@ public abstract class ItemContainer // If stackable item is found in inventory just add to current quantity if (item.isStackable() && (getItemByItemId(item.getId()) != null)) { - addItem("Restore", item, (getOwner() == null ? null : getOwner().getActingPlayer()), null); + addItem("Restore", item, getOwner() == null ? null : getOwner().getActingPlayer(), null); } else { diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java index afe3dfcf9c..e1bf825b5d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -89,13 +89,13 @@ public class Mail extends ItemContainer { continue; } - if (wh == null) + if (wh != null) { - item.setItemLocation(ItemLocation.WAREHOUSE); + transferItem("Expire", item.getObjectId(), item.getCount(), wh, null, null); } else { - transferItem("Expire", item.getObjectId(), item.getCount(), wh, null, null); + item.setItemLocation(ItemLocation.WAREHOUSE); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcFreight.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcFreight.java index 562b1cb13f..d9855fb07b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcFreight.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcFreight.java @@ -69,7 +69,7 @@ public class PcFreight extends ItemContainer @Override public boolean validateCapacity(long slots) { - return ((getSize() + slots) <= (_owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null))); + return (getSize() + slots) <= (_owner == null ? Config.ALT_FREIGHT_SLOTS : Config.ALT_FREIGHT_SLOTS + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null)); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java index 258a85a112..70bbcafbae 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java @@ -688,7 +688,7 @@ public class PcInventory extends Inventory public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) { final L2ItemInstance item = getItemByObjectId(objectId); - return item == null ? null : this.destroyItem(process, item, count, actor, reference); + return item == null ? null : destroyItem(process, item, count, actor, reference); } /** @@ -704,7 +704,7 @@ public class PcInventory extends Inventory public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference) { final L2ItemInstance item = getItemByItemId(itemId); - return item == null ? null : this.destroyItem(process, item, count, actor, reference); + return item == null ? null : destroyItem(process, item, count, actor, reference); } /** @@ -978,7 +978,7 @@ public class PcInventory extends Inventory */ public boolean hasInventoryBlock() { - return ((_blockMode > -1) && (_blockItems != null) && (_blockItems.length > 0)); + return (_blockMode > -1) && (_blockItems != null) && (_blockItems.length > 0); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java index c6258e17dc..1cf411994c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PcWarehouse.java @@ -51,6 +51,6 @@ public class PcWarehouse extends Warehouse @Override public boolean validateCapacity(long slots) { - return ((_items.size() + slots) <= _owner.getWareHouseLimit()); + return (_items.size() + slots) <= _owner.getWareHouseLimit(); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index ee12683dc4..783c5580ba 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/trunk/java/com/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -67,7 +67,7 @@ public class PetInventory extends Inventory { int slots = 0; - if (!(item.isStackable() && (getItemByItemId(item.getId()) != null)) && !item.getItem().hasExImmediateEffect()) + if ((!item.isStackable() || (getItemByItemId(item.getId()) == null)) && !item.getItem().hasExImmediateEffect()) { slots++; } @@ -78,7 +78,7 @@ public class PetInventory extends Inventory @Override public boolean validateCapacity(long slots) { - return ((_items.size() + slots) <= _owner.getInventoryLimit()); + return (_items.size() + slots) <= _owner.getInventoryLimit(); } public boolean validateWeight(L2ItemInstance item, long count) @@ -96,7 +96,7 @@ public class PetInventory extends Inventory @Override public boolean validateWeight(long weight) { - return ((_totalWeight + weight) <= _owner.getMaxLoad()); + return (_totalWeight + weight) <= _owner.getMaxLoad(); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java b/trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java index 2635ae65c5..42d3017a3c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java @@ -313,7 +313,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } } - _common = ((_itemId >= 11605) && (_itemId <= 12361)); + _common = (_itemId >= 11605) && (_itemId <= 12361); _heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842); _pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220)); } @@ -729,17 +729,17 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable public boolean isPotion() { - return (getItemType() == EtcItemType.POTION); + return getItemType() == EtcItemType.POTION; } public boolean isElixir() { - return (getItemType() == EtcItemType.ELIXIR); + return getItemType() == EtcItemType.ELIXIR; } public boolean isScroll() { - return (getItemType() == EtcItemType.SCROLL); + return getItemType() == EtcItemType.SCROLL; } /** @@ -870,7 +870,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable } // Don't allow hero equipment and restricted items during Olympiad - if ((isOlyRestrictedItem() || isHeroItem()) && ((activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode())) + if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode()) { if (isEquipable()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/L2WarehouseItem.java b/trunk/java/com/l2jmobius/gameserver/model/items/L2WarehouseItem.java index 25fa5e99d4..26880e27f3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/L2WarehouseItem.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/L2WarehouseItem.java @@ -202,7 +202,7 @@ public class L2WarehouseItem */ public final boolean isWeapon() { - return (_item instanceof L2Weapon); + return _item instanceof L2Weapon; } /** @@ -210,7 +210,7 @@ public class L2WarehouseItem */ public final boolean isArmor() { - return (_item instanceof L2Armor); + return _item instanceof L2Armor; } /** @@ -218,7 +218,7 @@ public class L2WarehouseItem */ public final boolean isEtcItem() { - return (_item instanceof L2EtcItem); + return _item instanceof L2EtcItem; } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/L2Weapon.java b/trunk/java/com/l2jmobius/gameserver/model/items/L2Weapon.java index 436724eeff..a77aeba526 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/L2Weapon.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/L2Weapon.java @@ -331,7 +331,7 @@ public final class L2Weapon extends L2Item */ public void castOnCriticalSkill(L2Character caster, L2Character target) { - if ((_skillsOnCrit == null)) + if (_skillsOnCrit == null) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java b/trunk/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java index 9586b7492c..705b7167ad 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java @@ -54,7 +54,7 @@ public final class EnchantScroll extends AbstractEnchantItem _isBlessed = (type == EtcItemType.BLESS_SCRL_ENCHANT_AM) || (type == EtcItemType.BLESS_SCRL_ENCHANT_WP); _isSafe = (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP); _isGiant = (type == EtcItemType.GIANT_SCRL_ENCHANT_AM) || (type == EtcItemType.GIANT_SCRL_ENCHANT_WP); - _isHair = (type == EtcItemType.SCRL_ENCHANT_HR); + _isHair = type == EtcItemType.SCRL_ENCHANT_HR; } @Override @@ -133,7 +133,7 @@ public final class EnchantScroll extends AbstractEnchantItem _log.info("bodypart: " + itemToEnchant.getItem().getBodyPart()); return false; } - else if ((supportItem != null)) + else if (supportItem != null) { if (isBlessed() && (supportItem.getItem().getItemType() != EtcItemType.BLESS_SCRL_INC_ENCHANT_PROP_WP) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_SCRL_INC_ENCHANT_PROP_AM) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_DROP_SCRL_INC_ENCHANT_PROP_WP) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_DROP_SCRL_INC_ENCHANT_PROP_AM)) { @@ -205,7 +205,7 @@ public final class EnchantScroll extends AbstractEnchantItem final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100); final double random = 100 * Rnd.nextDouble(); - final boolean success = (random < finalChance); + final boolean success = random < finalChance; if (player.isDebug()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/trunk/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index beb0584105..6b4181f0ec 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -330,13 +330,13 @@ public final class L2ItemInstance extends L2Object String referenceName = "no-reference"; if (reference instanceof L2Object) { - referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"); + referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"; } else if (reference instanceof String) { referenceName = (String) reference; } - final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); + final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName); @@ -492,13 +492,13 @@ public final class L2ItemInstance extends L2Object String referenceName = "no-reference"; if (reference instanceof L2Object) { - referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"); + referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name"; } else if (reference instanceof String) { referenceName = (String) reference; } - final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target"); + final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target"; if (Config.GMAUDIT) { GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName); @@ -527,7 +527,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isEquipable() { - return !((_item.getBodyPart() == 0) || (_item.getItemType() == EtcItemType.ARROW) || (_item.getItemType() == EtcItemType.BOLT) || (_item.getItemType() == EtcItemType.LURE)); + return (_item.getBodyPart() != 0) && (_item.getItemType() != EtcItemType.ARROW) && (_item.getItemType() != EtcItemType.BOLT) && (_item.getItemType() != EtcItemType.LURE); } /** @@ -619,7 +619,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isEtcItem() { - return (_item instanceof L2EtcItem); + return _item instanceof L2EtcItem; } /** @@ -627,7 +627,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isWeapon() { - return (_item instanceof L2Weapon); + return _item instanceof L2Weapon; } /** @@ -635,7 +635,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isArmor() { - return (_item instanceof L2Armor); + return _item instanceof L2Armor; } /** @@ -1247,7 +1247,7 @@ public final class L2ItemInstance extends L2Object */ public boolean isShadowItem() { - return (_mana >= 0); + return _mana >= 0; } /** @@ -1422,7 +1422,7 @@ public final class L2ItemInstance extends L2Object */ public void updateDatabase() { - this.updateDatabase(false); + updateDatabase(false); } /** @@ -1788,7 +1788,7 @@ public final class L2ItemInstance extends L2Object public boolean isNightLure() { - return (((_itemId >= 8505) && (_itemId <= 8513)) || (_itemId == 8485)); + return ((_itemId >= 8505) && (_itemId <= 8513)) || (_itemId == 8485); } public void setCountDecrease(boolean decrease) @@ -1821,7 +1821,7 @@ public final class L2ItemInstance extends L2Object public boolean isTimeLimitedItem() { - return (_time > 0); + return _time > 0; } /** @@ -2349,7 +2349,7 @@ public final class L2ItemInstance extends L2Object public void addCommonSoulCrystalOption(SoulCrystalOption option) { - if ((isEquipped()) && (_commonSoulCrystalOptions[option.getSlot() - 1] != null) && (getActingPlayer() != null)) + if (isEquipped() && (_commonSoulCrystalOptions[option.getSlot() - 1] != null) && (getActingPlayer() != null)) { getActingPlayer().removeSkill(_commonSoulCrystalOptions[option.getSlot() - 1].getSkill(), true); } @@ -2358,7 +2358,7 @@ public final class L2ItemInstance extends L2Object public void setSpecialSoulCrystalOption(SoulCrystalOption special) { - if ((isEquipped()) && (_specialSoulCrystalOption != null) && (getActingPlayer() != null)) + if (isEquipped() && (_specialSoulCrystalOption != null) && (getActingPlayer() != null)) { getActingPlayer().removeSkill(_specialSoulCrystalOption.getSkill(), true); } @@ -2450,7 +2450,7 @@ public final class L2ItemInstance extends L2Object public void applySoulCrystalOptionEffect() { final L2PcInstance owner = getActingPlayer(); - if ((owner == null) || (!isEquipped())) + if ((owner == null) || !isEquipped()) { return; } @@ -2474,7 +2474,7 @@ public final class L2ItemInstance extends L2Object public void removeSoulCrystalOptionEffect() { final L2PcInstance owner = getActingPlayer(); - if ((owner == null) || (isEquipped())) + if ((owner == null) || isEquipped()) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/items/type/ItemType.java b/trunk/java/com/l2jmobius/gameserver/model/items/type/ItemType.java index 4e0555619b..22eb63598c 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/items/type/ItemType.java +++ b/trunk/java/com/l2jmobius/gameserver/model/items/type/ItemType.java @@ -22,5 +22,5 @@ package com.l2jmobius.gameserver.model.items.type; */ public interface ItemType { - public int mask(); + int mask(); } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index 867b62b257..8f341b68b4 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -160,7 +160,7 @@ public abstract class AbstractOlympiadGame return null; } - protected static final boolean portPlayerToArena(Participant par, Location loc, int id) + protected static boolean portPlayerToArena(Participant par, Location loc, int id) { final L2PcInstance player = par.getPlayer(); if ((player == null) || !player.isOnline()) @@ -194,7 +194,7 @@ public abstract class AbstractOlympiadGame return true; } - protected static final void removals(L2PcInstance player, boolean removeParty) + protected static void removals(L2PcInstance player, boolean removeParty) { try { @@ -297,7 +297,7 @@ public abstract class AbstractOlympiadGame } } - protected static final void cleanEffects(L2PcInstance player) + protected static void cleanEffects(L2PcInstance player) { try { @@ -350,7 +350,7 @@ public abstract class AbstractOlympiadGame } } - protected static final void playerStatusBack(L2PcInstance player) + protected static void playerStatusBack(L2PcInstance player) { try { @@ -401,7 +401,7 @@ public abstract class AbstractOlympiadGame } } - protected static final void portPlayerBack(L2PcInstance player) + protected static void portPlayerBack(L2PcInstance player) { if (player == null) { @@ -418,7 +418,7 @@ public abstract class AbstractOlympiadGame player.unsetLastLocation(); } - public static final void rewardParticipant(L2PcInstance player, int[][] reward) + public static void rewardParticipant(L2PcInstance player, int[][] reward) { if ((player == null) || !player.isOnline() || (reward == null)) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java index 170303fd08..71afa26489 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java @@ -549,7 +549,7 @@ public class Olympiad extends ListenersContainer private long getMillisToOlympiadEnd() { // if (_olympiadEnd > Calendar.getInstance().getTimeInMillis()) - return (_olympiadEnd - Calendar.getInstance().getTimeInMillis()); + return _olympiadEnd - Calendar.getInstance().getTimeInMillis(); // return 10L; } @@ -567,14 +567,14 @@ public class Olympiad extends ListenersContainer { if (_validationEnd > Calendar.getInstance().getTimeInMillis()) { - return (_validationEnd - Calendar.getInstance().getTimeInMillis()); + return _validationEnd - Calendar.getInstance().getTimeInMillis(); } return 10L; } public boolean isOlympiadEnd() { - return (_period != 0); + return _period != 0; } protected void setNewOlympiadEnd() @@ -612,7 +612,7 @@ public class Olympiad extends ListenersContainer if (_compStart.getTimeInMillis() > Calendar.getInstance().getTimeInMillis()) { - return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis()); + return _compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); } return setNewCompBegin(); @@ -628,13 +628,13 @@ public class Olympiad extends ListenersContainer _log.info("Olympiad System: New Schedule @ " + _compStart.getTime()); - return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis()); + return _compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis(); } protected long getMillisToCompEnd() { // if (_compEnd > Calendar.getInstance().getTimeInMillis()) - return (_compEnd - Calendar.getInstance().getTimeInMillis()); + return _compEnd - Calendar.getInstance().getTimeInMillis(); // return 10L; } @@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer { if (_nextWeeklyChange > Calendar.getInstance().getTimeInMillis()) { - return (_nextWeeklyChange - Calendar.getInstance().getTimeInMillis()); + return _nextWeeklyChange - Calendar.getInstance().getTimeInMillis(); } return 10L; } @@ -707,7 +707,7 @@ public class Olympiad extends ListenersContainer public boolean playerInStadia(L2PcInstance player) { - return (ZoneManager.getInstance().getOlympiadStadium(player) != null); + return ZoneManager.getInstance().getOlympiadStadium(player) != null; } /** @@ -964,27 +964,21 @@ public class Olympiad extends ListenersContainer { winner = hero2; } + else if (hero1Comps > hero2Comps) + { + winner = hero1; + } + else if (hero2Comps > hero1Comps) + { + winner = hero2; + } + else if (hero1Wins > hero2Wins) + { + winner = hero1; + } else { - if (hero1Comps > hero2Comps) - { - winner = hero1; - } - else if (hero2Comps > hero1Comps) - { - winner = hero2; - } - else - { - if (hero1Wins > hero2Wins) - { - winner = hero1; - } - else - { - winner = hero2; - } - } + winner = hero2; } hero.set(CLASS_ID, winner.getInt(CLASS_ID)); @@ -1052,7 +1046,7 @@ public class Olympiad extends ListenersContainer } final int rank = NOBLES_RANK.get(objId); - int points = (player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0); + int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0; switch (rank) { case 1: diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java index 9f23d1f0ce..e4b79de571 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java @@ -55,7 +55,7 @@ public class OlympiadGameClassed extends OlympiadGameNormal return COMP_DONE_WEEK_CLASSED; } - protected static final OlympiadGameClassed createGame(int id, List> classList) + protected static OlympiadGameClassed createGame(int id, List> classList) { if ((classList == null) || classList.isEmpty()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java index 3921412b64..3950ff0829 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java @@ -53,7 +53,7 @@ public class OlympiadGameManager implements Runnable _log.log(Level.INFO, "Olympiad System: Loaded " + _tasks.length + " stadiums."); } - public static final OlympiadGameManager getInstance() + public static OlympiadGameManager getInstance() { return SingletonHolder._instance; } @@ -145,15 +145,12 @@ public class OlympiadGameManager implements Runnable } } } - else + // not in competition period + else if (isAllTasksFinished()) { - // not in competition period - if (isAllTasksFinished()) - { - OlympiadManager.getInstance().clearRegistered(); - _battleStarted = false; - _log.log(Level.INFO, "Olympiad System: All current games finished."); - } + OlympiadManager.getInstance().clearRegistered(); + _battleStarted = false; + _log.log(Level.INFO, "Olympiad System: All current games finished."); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNonClassed.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNonClassed.java index 26f345d94b..f63bc78435 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNonClassed.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNonClassed.java @@ -54,7 +54,7 @@ public class OlympiadGameNonClassed extends OlympiadGameNormal return COMP_DONE_WEEK_NON_CLASSED; } - protected static final OlympiadGameNonClassed createGame(int id, List list) + protected static OlympiadGameNonClassed createGame(int id, List list) { final Participant[] opponents = OlympiadGameNormal.createListOfParticipants(list); return opponents == null ? null : new OlympiadGameNonClassed(id, opponents); diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java index c9bf9585e6..3f9f82e699 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java @@ -62,7 +62,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _playerTwo.getPlayer().setOlympiadGameId(id); } - protected static final Participant[] createListOfParticipants(List list) + protected static Participant[] createListOfParticipants(List list) { if ((list == null) || list.isEmpty() || (list.size() < 2)) { @@ -319,8 +319,8 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame final List list1 = new ArrayList<>(1); final List list2 = new ArrayList<>(1); - final boolean _pOneCrash = ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected()); - final boolean _pTwoCrash = ((_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected()); + final boolean _pOneCrash = (_playerOne.getPlayer() == null) || _playerOne.isDisconnected(); + final boolean _pTwoCrash = (_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected(); final int playerOnePoints = _playerOne.getStats().getInt(POINTS); final int playerTwoPoints = _playerTwo.getStats().getInt(POINTS); @@ -577,7 +577,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame String winner = "draw"; // Calculate Fight time - final long _fightTime = (System.currentTimeMillis() - _startTime); + final long _fightTime = System.currentTimeMillis() - _startTime; double playerOneHp = 0; if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) @@ -784,7 +784,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame _damageP2 = 0; } - protected static final void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) + protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) { try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement ps = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) @@ -796,7 +796,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame ps.setInt(5, winner); ps.setLong(6, startTime); ps.setLong(7, fightTime); - ps.setInt(8, (type == CompetitionType.CLASSED ? 1 : 0)); + ps.setInt(8, type == CompetitionType.CLASSED ? 1 : 0); ps.execute(); } catch (SQLException e) diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java index ce0f2157fc..ad6d2b4eb5 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java @@ -94,7 +94,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame } } - protected static final Participant[][] createListOfParticipants(List> list) + protected static Participant[][] createListOfParticipants(List> list) { if ((list == null) || list.isEmpty() || (list.size() < 2)) { @@ -111,7 +111,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame { teamOne = list.remove(Rnd.nextInt(list.size())); - if (((teamOne == null) || teamOne.isEmpty())) + if ((teamOne == null) || teamOne.isEmpty()) { continue; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java index f0b8b543fa..1b9175c747 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java @@ -49,7 +49,7 @@ public class OlympiadManager _teamsBasedRegisters = new CopyOnWriteArrayList<>(); } - public static final OlympiadManager getInstance() + public static OlympiadManager getInstance() { return SingletonHolder._instance; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/olympiad/Participant.java b/trunk/java/com/l2jmobius/gameserver/model/olympiad/Participant.java index 24d81d11e6..d1554e5ab9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/olympiad/Participant.java +++ b/trunk/java/com/l2jmobius/gameserver/model/olympiad/Participant.java @@ -70,7 +70,7 @@ public final class Participant { player = L2World.getInstance().getPlayer(getObjectId()); } - return (player != null); + return player != null; } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java b/trunk/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java index 4a94c729b5..2bf21789fc 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java +++ b/trunk/java/com/l2jmobius/gameserver/model/punishment/PunishmentTask.java @@ -147,7 +147,7 @@ public class PunishmentTask implements Runnable onStart(); if (_expirationTime > 0) // Has expiration? { - _task = ThreadPoolManager.getInstance().scheduleGeneral(this, (_expirationTime - System.currentTimeMillis())); + _task = ThreadPoolManager.getInstance().scheduleGeneral(this, _expirationTime - System.currentTimeMillis()); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java b/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java index 74223f9183..d204baed14 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/trunk/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1030,7 +1030,7 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onDeath(L2Character killer, L2Character victim, QuestState qs) { - return onAdvEvent("", ((killer instanceof L2Npc) ? ((L2Npc) killer) : null), qs.getPlayer()); + return onAdvEvent("", (killer instanceof L2Npc) ? (L2Npc) killer : null, qs.getPlayer()); } /** @@ -1439,7 +1439,7 @@ public class Quest extends AbstractScript implements IIdentifiable { _log.warning(getClass().getSimpleName() + ": " + t.getMessage()); } - return (player != null) && player.getAccessLevel().isGm() && showResult(player, ("Script error" + Util.getStackTrace(t) + "")); + return (player != null) && player.getAccessLevel().isGm() && showResult(player, "Script error" + Util.getStackTrace(t) + ""); } /** @@ -1496,7 +1496,7 @@ public class Quest extends AbstractScript implements IIdentifiable * Loads all quest states and variables for the specified player. * @param player the player who is entering the world */ - public static final void playerEnter(L2PcInstance player) + public static void playerEnter(L2PcInstance player) { try (Connection con = DatabaseFactory.getInstance().getConnection(); PreparedStatement invalidQuestData = con.prepareStatement("DELETE FROM character_quests WHERE charId = ? AND name = ?"); @@ -2302,7 +2302,7 @@ public class Quest extends AbstractScript implements IIdentifiable return null; } final L2Party party = player.getParty(); - return (party == null) || (party.getMembers().isEmpty()) ? player : party.getMembers().get(Rnd.get(party.getMembers().size())); + return (party == null) || party.getMembers().isEmpty() ? player : party.getMembers().get(Rnd.get(party.getMembers().size())); } /** @@ -2345,7 +2345,7 @@ public class Quest extends AbstractScript implements IIdentifiable QuestState temp = null; final L2Party party = player.getParty(); // if this player is not in a party, just check if this player instance matches the conditions itself - if ((party == null) || (party.getMembers().isEmpty())) + if ((party == null) || party.getMembers().isEmpty()) { temp = player.getQuestState(getName()); return (temp != null) && temp.isSet(var) && temp.get(var).equalsIgnoreCase(value) ? player : null; @@ -2362,7 +2362,7 @@ public class Quest extends AbstractScript implements IIdentifiable continue; } temp = partyMember.getQuestState(getName()); - if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, 1500, true, false)) + if ((temp != null) && (temp.get(var) != null) && temp.get(var).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, 1500, true, false)) { candidates.add(partyMember); } @@ -2391,7 +2391,7 @@ public class Quest extends AbstractScript implements IIdentifiable QuestState temp = null; final L2Party party = player.getParty(); // if this player is not in a party, just check if this player instance matches the conditions itself - if ((party == null) || (party.getMembers().isEmpty())) + if ((party == null) || party.getMembers().isEmpty()) { temp = player.getQuestState(getName()); return (temp != null) && (temp.getState() == state) ? player : null; @@ -2530,12 +2530,12 @@ public class Quest extends AbstractScript implements IIdentifiable private boolean checkPartyMemberConditions(QuestState qs, int condition, L2Npc npc) { - return ((qs != null) && ((condition == -1) ? qs.isStarted() : qs.isCond(condition)) && checkPartyMember(qs, npc)); + return (qs != null) && ((condition == -1) ? qs.isStarted() : qs.isCond(condition)) && checkPartyMember(qs, npc); } private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) { - return ((target == null) || com.l2jmobius.gameserver.util.Util.checkIfInRange(1500, player, target, true)); + return (target == null) || com.l2jmobius.gameserver.util.Util.checkIfInRange(1500, player, target, true); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/quest/QuestState.java b/trunk/java/com/l2jmobius/gameserver/model/quest/QuestState.java index b1b2fbad20..ae1deae0b9 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/quest/QuestState.java +++ b/trunk/java/com/l2jmobius/gameserver/model/quest/QuestState.java @@ -120,7 +120,7 @@ public final class QuestState */ public boolean isCreated() { - return (_state == State.CREATED); + return _state == State.CREATED; } /** @@ -129,7 +129,7 @@ public final class QuestState */ public boolean isStarted() { - return (_state == State.STARTED); + return _state == State.STARTED; } /** @@ -138,7 +138,7 @@ public final class QuestState */ public boolean isCompleted() { - return (_state == State.COMPLETED); + return _state == State.COMPLETED; } /** @@ -322,10 +322,10 @@ public final class QuestState // since no flag had been skipped until now, the least significant bits must all // be set to 1, up until "old" number of bits. - completedStateFlags |= ((1 << old) - 1); + completedStateFlags |= (1 << old) - 1; // now, just set the bit corresponding to the passed cond to 1 (current step) - completedStateFlags |= (1 << (cond - 1)); + completedStateFlags |= 1 << (cond - 1); set("__compltdStateFlags", String.valueOf(completedStateFlags)); } } @@ -334,7 +334,7 @@ public final class QuestState else if (cond < old) { // note, this also unsets the flag indicating that there exist skips - completedStateFlags &= ((1 << cond) - 1); + completedStateFlags &= (1 << cond) - 1; // now, check if this resulted in no steps being skipped any more if (completedStateFlags == ((1 << cond) - 1)) @@ -354,7 +354,7 @@ public final class QuestState // Just mark this state and we are done. else { - completedStateFlags |= (1 << (cond - 1)); + completedStateFlags |= 1 << (cond - 1); set("__compltdStateFlags", String.valueOf(completedStateFlags)); } @@ -509,7 +509,7 @@ public final class QuestState */ public boolean isCond(int condition) { - return (getInt("cond") == condition); + return getInt("cond") == condition; } /** @@ -546,7 +546,7 @@ public final class QuestState */ public boolean isSet(String variable) { - return (get(variable) != null); + return get(variable) != null; } /** @@ -588,7 +588,7 @@ public final class QuestState public boolean isMemoState(int memoState) { - return (getInt("memoState") == memoState); + return getInt("memoState") == memoState; } /** @@ -621,7 +621,7 @@ public final class QuestState */ public boolean isMemoStateEx(int slot, int memoStateEx) { - return (getMemoStateEx(slot) == memoStateEx); + return getMemoStateEx(slot) == memoStateEx; } /** @@ -1028,7 +1028,7 @@ public final class QuestState public boolean isNowAvailable() { final String val = get("restartTime"); - return ((val == null) || !Util.isDigit(val)) || (Long.parseLong(val) <= System.currentTimeMillis()); + return (val == null) || !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis()); } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java b/trunk/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java index 76a58a61dd..75e5250b01 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java +++ b/trunk/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java @@ -204,7 +204,7 @@ public enum AbnormalVisualEffect * @param name the name * @return The abnormal visual effect if its found, {@code null} otherwise */ - public static final AbnormalVisualEffect findByName(String name) + public static AbnormalVisualEffect findByName(String name) { for (AbnormalVisualEffect abnormalVisualEffect : values()) { diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java b/trunk/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java index 5cc3c6dd42..829d249130 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java @@ -339,7 +339,7 @@ public final class BuffInfo // Remove abnormal visual effects. resetAbnormalVisualEffects(); // Set the proper system message. - if (!(_effected.isSummon() && !((L2Summon) _effected).getOwner().hasSummon())) + if (!_effected.isSummon() || ((L2Summon) _effected).getOwner().hasSummon()) { SystemMessageId smId = null; if (_skill.isToggle()) diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/Skill.java b/trunk/java/com/l2jmobius/gameserver/model/skills/Skill.java index 9bbd95b117..baf1cf5fb3 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/skills/Skill.java +++ b/trunk/java/com/l2jmobius/gameserver/model/skills/Skill.java @@ -832,7 +832,7 @@ public final class Skill implements IIdentifiable public int getAffectLimit() { - return (_affectLimit[0] + Rnd.get(_affectLimit[1])); + return _affectLimit[0] + Rnd.get(_affectLimit[1]); } public boolean isActive() @@ -1111,7 +1111,7 @@ public final class Skill implements IIdentifiable * @param sourceInArena * @return */ - public static final boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena) + public static boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena) { if ((target == null) || target.isDead() || (target == caster)) { @@ -1164,7 +1164,7 @@ public final class Skill implements IIdentifiable return false; } - if (!sourceInArena && !(targetPlayer.isInsideZone(ZoneId.PVP) && !targetPlayer.isInsideZone(ZoneId.SIEGE))) + if (!sourceInArena && (!targetPlayer.isInsideZone(ZoneId.PVP) || targetPlayer.isInsideZone(ZoneId.SIEGE))) { if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId())) { @@ -1200,13 +1200,10 @@ public final class Skill implements IIdentifiable } } } - else + // target is mob + else if ((targetPlayer == null) && (target instanceof L2Attackable) && (caster instanceof L2Attackable)) { - // target is mob - if ((targetPlayer == null) && (target instanceof L2Attackable) && (caster instanceof L2Attackable)) - { - return false; - } + return false; } if (!GeoData.getInstance().canSeeTarget(caster, target)) @@ -1216,13 +1213,13 @@ public final class Skill implements IIdentifiable return true; } - public static final boolean addPet(L2Character caster, L2PcInstance owner, int radius, boolean isDead) + public static boolean addPet(L2Character caster, L2PcInstance owner, int radius, boolean isDead) { final L2Summon pet = owner.getPet(); return (pet != null) && addCharacter(caster, pet, radius, isDead); } - public static final boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead) + public static boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead) { if (isDead != target.isDead()) { @@ -1354,7 +1351,7 @@ public final class Skill implements IIdentifiable } // Check bad skills against target. - if ((effector != effected) && isBad() && ((effected.isInvul() && (!effected.isVulnerableFor(effector))) || (effector.isGM() && !effector.getAccessLevel().canGiveDamage()))) + if ((effector != effected) && isBad() && ((effected.isInvul() && !effected.isVulnerableFor(effector)) || (effector.isGM() && !effector.getAccessLevel().canGiveDamage()))) { return; } @@ -1366,12 +1363,9 @@ public final class Skill implements IIdentifiable return; } } - else + else if (effected.isBuffBlocked() && !isBad()) { - if (effected.isBuffBlocked() && !isBad()) - { - return; - } + return; } if (effected.isInvulAgainst(getId(), getLevel())) @@ -1677,7 +1671,7 @@ public final class Skill implements IIdentifiable */ public boolean canBeStolen() { - return !isPassive() && !isToggle() && !isDebuff() && !isHeroSkill() && !isGMSkill() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispeled() && (getId() != CommonSkill.SERVITOR_SHARE.getId()); + return !isPassive() && !isToggle() && !isDebuff() && !isHeroSkill() && !isGMSkill() && (!isStatic() || (getId() == CommonSkill.CARAVANS_SECRET_MEDICINE.getId())) && canBeDispeled() && (getId() != CommonSkill.SERVITOR_SHARE.getId()); } public boolean isClanSkill() diff --git a/trunk/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java b/trunk/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java index 5d9273531e..44224c76e2 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java +++ b/trunk/java/com/l2jmobius/gameserver/model/skills/SkillOperateType.java @@ -137,7 +137,7 @@ public enum SkillOperateType */ public boolean isSelfContinuous() { - return (this == ACTIVE_WITH_TRIGGER); + return this == ACTIVE_WITH_TRIGGER; } /** @@ -146,7 +146,7 @@ public enum SkillOperateType */ public boolean isPassive() { - return (this == PASSIVE); + return this == PASSIVE; } /** @@ -155,7 +155,7 @@ public enum SkillOperateType */ public boolean isToggle() { - return (this == TOGGLE); + return this == TOGGLE; } /** diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 3a29479500..a731f33e80 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -236,7 +236,7 @@ public final class Formulas * @param cha * @return */ - public static final double calcHpRegen(L2Character cha) + public static double calcHpRegen(L2Character cha) { double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseHpRegen(cha.getLevel()) : cha.getTemplate().getBaseHpReg(); double hpRegenMultiplier = cha.isRaid() ? Config.RAID_HP_REGEN_MULTIPLIER : Config.HP_REGEN_MULTIPLIER; @@ -339,7 +339,7 @@ public final class Formulas * @param cha * @return */ - public static final double calcMpRegen(L2Character cha) + public static double calcMpRegen(L2Character cha) { double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseMpRegen(cha.getLevel()) : cha.getTemplate().getBaseMpReg(); double mpRegenMultiplier = cha.isRaid() ? Config.RAID_MP_REGEN_MULTIPLIER : Config.MP_REGEN_MULTIPLIER; @@ -431,7 +431,7 @@ public final class Formulas * @param player the player * @return the CP regeneration rate */ - public static final double calcCpRegen(L2PcInstance player) + public static double calcCpRegen(L2PcInstance player) { double cpRegenMultiplier = Config.CP_REGEN_MULTIPLIER; // With CON bonus @@ -453,7 +453,7 @@ public final class Formulas return player.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier; } - public static final double calcSiegeRegenModifier(L2PcInstance activeChar) + public static double calcSiegeRegenModifier(L2PcInstance activeChar) { if ((activeChar == null) || (activeChar.getClan() == null)) { @@ -502,12 +502,12 @@ public final class Formulas } // Initial damage - final double baseMod = ((77 * (power + (attacker.getPAtk(target) * ssboost))) / defence); + final double baseMod = (77 * (power + (attacker.getPAtk(target) * ssboost))) / defence; // Critical - final double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); + final double criticalMod = attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill); final double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); - final double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); - final double criticalAddMod = ((attacker.getStat().calcStat(Stats.CRITICAL_DAMAGE_ADD, 0) * 6.1 * 77) / defence); + final double criticalVulnMod = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill); + final double criticalAddMod = (attacker.getStat().calcStat(Stats.CRITICAL_DAMAGE_ADD, 0) * 6.1 * 77) / defence; final double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); // Trait, elements final double weaponTraitMod = calcWeaponTraitBonus(attacker, target); @@ -596,10 +596,10 @@ public final class Formulas // Initial damage final double baseMod = ((77 * (skill.getPower(isPvP, isPvE) + attacker.getPAtk(target))) / defence) * ssboost; // Critical - final double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill)); + final double criticalMod = attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill); final double criticalModPos = 1 + ((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2); - final double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill)); - final double criticalAddMod = ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 6.1 * 77) / defence); + final double criticalVulnMod = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill); + final double criticalAddMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 6.1 * 77) / defence; final double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); // Trait, elements final double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); @@ -660,7 +660,7 @@ public final class Formulas * @param ss if weapon item was charged by soulshot * @return */ - public static final double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss) + public static double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss) { final boolean isPvP = attacker.isPlayable() && target.isPlayable(); final boolean isPvE = attacker.isPlayable() && target.isAttackable(); @@ -696,15 +696,15 @@ public final class Formulas if (attacker.isPlayer()) { double rubyBonus = 0; - if ((attacker.getInventory().getItemByItemId(38859) != null) && (attacker.getInventory().getItemByItemId(38859).isEquipped())) + if ((attacker.getInventory().getItemByItemId(38859) != null) && attacker.getInventory().getItemByItemId(38859).isEquipped()) { rubyBonus = 0.2; } - else if ((attacker.getInventory().getItemByItemId(38858) != null) && (attacker.getInventory().getItemByItemId(38858).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38858) != null) && attacker.getInventory().getItemByItemId(38858).isEquipped()) { rubyBonus = 0.125; } - else if ((attacker.getInventory().getItemByItemId(38857) != null) && (attacker.getInventory().getItemByItemId(38857).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38857) != null) && attacker.getInventory().getItemByItemId(38857).isEquipped()) { rubyBonus = 0.075; } @@ -730,7 +730,7 @@ public final class Formulas // Retail like formula. damage = 2 * attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill) * attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) * target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, null) * ((76 * damage * proximityBonus) / (defence * reduceDef)); // Crit dmg add is almost useless in normal hits. - damage += ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 77) / (defence * reduceDef)); + damage += (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 77) / (defence * reduceDef); damage += target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill); } else @@ -763,13 +763,13 @@ public final class Formulas // Dmg bonuses in PvP fight if (isPvP) { - if (skill == null) + if (skill != null) { - damage *= attacker.calcStat(Stats.PVP_PHYSICAL_DMG, 1, null, null); + damage *= attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, 1, null, null); } else { - damage *= attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, 1, null, null); + damage *= attacker.calcStat(Stats.PVP_PHYSICAL_DMG, 1, null, null); } } @@ -823,16 +823,13 @@ public final class Formulas damage *= Config.NPC_CRIT_DMG_PENALTY.get(lvlDiff); } } + else if (lvlDiff >= Config.NPC_DMG_PENALTY.size()) + { + damage *= Config.NPC_DMG_PENALTY.get(Config.NPC_DMG_PENALTY.size() - 1); + } else { - if (lvlDiff >= Config.NPC_DMG_PENALTY.size()) - { - damage *= Config.NPC_DMG_PENALTY.get(Config.NPC_DMG_PENALTY.size() - 1); - } - else - { - damage *= Config.NPC_DMG_PENALTY.get(lvlDiff); - } + damage *= Config.NPC_DMG_PENALTY.get(lvlDiff); } } } @@ -846,7 +843,7 @@ public final class Formulas return damage; } - public static final double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit) + public static double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit) { double mDef = target.getMDef(attacker, skill); switch (shld) @@ -884,15 +881,15 @@ public final class Formulas { double sapphireBonus = 0; double ssEnchBonus = 0; - if ((attacker.getInventory().getItemByItemId(38931) != null) && (attacker.getInventory().getItemByItemId(38931).isEquipped())) + if ((attacker.getInventory().getItemByItemId(38931) != null) && attacker.getInventory().getItemByItemId(38931).isEquipped()) { sapphireBonus = 0.2; } - else if ((attacker.getInventory().getItemByItemId(38930) != null) && (attacker.getInventory().getItemByItemId(38930).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38930) != null) && attacker.getInventory().getItemByItemId(38930).isEquipped()) { sapphireBonus = 0.125; } - else if ((attacker.getInventory().getItemByItemId(38929) != null) && (attacker.getInventory().getItemByItemId(38929).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38929) != null) && attacker.getInventory().getItemByItemId(38929).isEquipped()) { sapphireBonus = 0.075; } @@ -942,7 +939,7 @@ public final class Formulas if (target.isPlayer()) { - final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); + final SystemMessage sm = skill.hasEffectType(L2EffectType.HP_DRAIN) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); sm.addCharName(attacker); target.sendPacket(sm); } @@ -959,7 +956,7 @@ public final class Formulas // PvP bonuses for damage if (isPvP) { - damage *= attacker.calcStat((skill.isMagic() ? Stats.PVP_MAGICAL_DMG : Stats.PVP_PHYS_SKILL_DMG), 1, null, null); + damage *= attacker.calcStat(skill.isMagic() ? Stats.PVP_MAGICAL_DMG : Stats.PVP_PHYS_SKILL_DMG, 1, null, null); } damage *= calcAttributeBonus(attacker, target, skill); @@ -990,7 +987,7 @@ public final class Formulas return damage; } - public static final double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld) + public static double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld) { double mDef = target.getMDef(attacker.getOwner(), skill); switch (shld) @@ -1071,7 +1068,7 @@ public final class Formulas return damage; } - public static final boolean calcCrit(L2Character attacker, L2Character target) + public static boolean calcCrit(L2Character attacker, L2Character target) { return calcCrit(attacker, target, null); } @@ -1083,7 +1080,7 @@ public final class Formulas * @param skill * @return */ - public static final boolean calcCrit(L2Character attacker, L2Character target, Skill skill) + public static boolean calcCrit(L2Character attacker, L2Character target, Skill skill) { double rate = 0.d; if (skill != null) @@ -1097,7 +1094,7 @@ public final class Formulas return (target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE, rate, null, null) + target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE_ADD, 0, null, null)) > Rnd.get(1000); } - public static final boolean calcMCrit(double mRate) + public static boolean calcMCrit(double mRate) { return mRate > Rnd.get(1000); } @@ -1107,7 +1104,7 @@ public final class Formulas * @param dmg * @return true in case when ATTACK is canceled due to hit */ - public static final boolean calcAtkBreak(L2Character target, double dmg) + public static boolean calcAtkBreak(L2Character target, double dmg) { if (target.isChanneling()) { @@ -1134,7 +1131,7 @@ public final class Formulas init += Math.sqrt(13 * dmg); // Chance is affected by target MEN - init -= ((BaseStats.MEN.calcBonus(target) * 100) - 100); + init -= (BaseStats.MEN.calcBonus(target) * 100) - 100; // Calculate all modifiers for ATTACK_CANCEL double rate = target.calcStat(Stats.ATTACK_CANCEL, init, null, null); @@ -1152,7 +1149,7 @@ public final class Formulas * @param rate * @return */ - public static final int calcPAtkSpd(L2Character attacker, L2Character target, double rate) + public static int calcPAtkSpd(L2Character attacker, L2Character target, double rate) { return rate < 2 ? 2700 : (int) (470000 / rate); } @@ -1164,7 +1161,7 @@ public final class Formulas * @param skillTime * @return */ - public static final int calcAtkSpd(L2Character attacker, Skill skill, double skillTime) + public static int calcAtkSpd(L2Character attacker, Skill skill, double skillTime) { return skill.isMagic() ? (int) ((skillTime / attacker.getMAtkSpd()) * 333) : (int) ((skillTime / attacker.getPAtkSpd()) * 300); } @@ -1219,7 +1216,7 @@ public final class Formulas } final int degreeside = (int) target.calcStat(Stats.SHIELD_DEFENCE_ANGLE, 0, null, null) + 120; - if ((degreeside < 360) && (!target.isFacing(attacker, degreeside))) + if ((degreeside < 360) && !target.isFacing(attacker, degreeside)) { return 0; } @@ -1361,7 +1358,7 @@ public final class Formulas } } - final double baseMod = ((((((magicLevel - target.getLevel()) + 3) * skill.getLvlBonusRate()) + activateRate) + 30.0) - targetBaseStat); + final double baseMod = (((((magicLevel - target.getLevel()) + 3) * skill.getLvlBonusRate()) + activateRate) + 30.0) - targetBaseStat; final double elementMod = calcAttributeBonus(attacker, target, skill); final double traitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); final double buffDebuffMod = 1 + (target.calcStat(skill.isDebuff() ? Stats.DEBUFF_VULN : Stats.BUFF_VULN, 1, null, null) / 100); @@ -1429,7 +1426,7 @@ public final class Formulas // Calculate BaseRate. final double baseRate = skill.getPower(); final double statMod = skill.getBasicProperty().calcBonus(target); - double rate = (baseRate / statMod); + double rate = baseRate / statMod; // Resist Modifier. final double resMod = calcGeneralTraitBonus(attacker.getOwner(), target, skill.getTraitType(), false); @@ -1461,7 +1458,7 @@ public final class Formulas Debug.sendSkillDebug(attacker.getOwner(), target, skill, set); } - return (Rnd.get(100) < finalRate); + return Rnd.get(100) < finalRate; } public static boolean calcMagicSuccess(L2Character attacker, L2Character target, Skill skill) @@ -1472,7 +1469,7 @@ public final class Formulas } // FIXME: Fix this LevelMod Formula. - final int lvlDifference = (target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel())); + final int lvlDifference = target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel()); final double lvlModifier = Math.pow(1.3, lvlDifference); float targetModifier = 1; if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_MAGIC_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 3)) @@ -1502,7 +1499,7 @@ public final class Formulas Debug.sendSkillDebug(attacker, target, skill, set); } - return (Rnd.get(100) < rate); + return Rnd.get(100) < rate; } public static double calcManaDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit) @@ -1532,15 +1529,15 @@ public final class Formulas { double sapphireBonus = 0; double ssEnchBonus = 0; - if ((attacker.getInventory().getItemByItemId(38931) != null) && (attacker.getInventory().getItemByItemId(38931).isEquipped())) + if ((attacker.getInventory().getItemByItemId(38931) != null) && attacker.getInventory().getItemByItemId(38931).isEquipped()) { sapphireBonus = 0.2; } - else if ((attacker.getInventory().getItemByItemId(38930) != null) && (attacker.getInventory().getItemByItemId(38930).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38930) != null) && attacker.getInventory().getItemByItemId(38930).isEquipped()) { sapphireBonus = 0.125; } - else if ((attacker.getInventory().getItemByItemId(38929) != null) && (attacker.getInventory().getItemByItemId(38929).isEquipped())) + else if ((attacker.getInventory().getItemByItemId(38929) != null) && attacker.getInventory().getItemByItemId(38929).isEquipped()) { sapphireBonus = 0.075; } @@ -1666,17 +1663,17 @@ public final class Formulas { case 1: { - initVal = (BaseStats.STR).calcBonus(actor); + initVal = BaseStats.STR.calcBonus(actor); break; } case 4: { - initVal = (BaseStats.INT).calcBonus(actor); + initVal = BaseStats.INT.calcBonus(actor); break; } } initVal *= actor.getStat().calcStat(Stats.SKILL_CRITICAL_PROBABILITY, 1, null, null); - return (Rnd.get(100) < initVal); + return Rnd.get(100) < initVal; } /** @@ -1784,23 +1781,20 @@ public final class Formulas defence_attribute_mod = 0.55; } } + else if (defence_attribute >= 450) + { + attack_attribute_mod = 0.06909; + defence_attribute_mod = 0.078; + } + else if (defence_attribute >= 350) + { + attack_attribute_mod = 0.0887; + defence_attribute_mod = 0.1007; + } else { - if (defence_attribute >= 450) - { - attack_attribute_mod = 0.06909; - defence_attribute_mod = 0.078; - } - else if (defence_attribute >= 350) - { - attack_attribute_mod = 0.0887; - defence_attribute_mod = 0.1007; - } - else - { - attack_attribute_mod = 0.129; - defence_attribute_mod = 0.1473; - } + attack_attribute_mod = 0.129; + defence_attribute_mod = 0.1473; } final int attribute_diff = attack_attribute - defence_attribute; @@ -1842,7 +1836,7 @@ public final class Formulas defence_attribute_mod = (defence_attribute / 169.0) * defence_attribute_mod; - final double attribute_mod_diff = Util.constrain((attack_attribute_mod - defence_attribute_mod), min, max); + final double attribute_mod_diff = Util.constrain(attack_attribute_mod - defence_attribute_mod, min, max); double result = (attribute_mod_diff / 100.0) + 1; @@ -1877,7 +1871,7 @@ public final class Formulas attacker.sendPacket(sm); } - double counterdmg = (((target.getPAtk(attacker) * 10.0) * 70.0) / attacker.getPDef(target)); + double counterdmg = (target.getPAtk(attacker) * 10.0 * 70.0) / attacker.getPDef(target); counterdmg *= calcWeaponTraitBonus(attacker, target); counterdmg *= calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false); counterdmg *= calcAttributeBonus(attacker, target, skill); @@ -1926,7 +1920,7 @@ public final class Formulas // Apply DEX Mod. final double blowChance = skill.getBlowChance(); // Apply Position Bonus (TODO: values are unconfirmed, possibly custom, remove or update when confirmed). - final double sideMod = (activeChar.isInFrontOfTarget()) ? 1 : (activeChar.isBehindTarget()) ? 2 : 1.5; + final double sideMod = activeChar.isInFrontOfTarget() ? 1 : activeChar.isBehindTarget() ? 2 : 1.5; // Apply all mods. final double baseRate = blowChance * dexMod * sideMod; // Apply blow rates @@ -1983,7 +1977,7 @@ public final class Formulas for (int i = buffs.size() - 1; i >= 0; i--) // reverse order { final BuffInfo info = buffs.get(i); - if (!info.getSkill().canBeStolen() || (!calcCancelSuccess(info, cancelMagicLvl, (int) finalRate, skill))) + if (!info.getSkill().canBeStolen() || !calcCancelSuccess(info, cancelMagicLvl, (int) finalRate, skill)) { continue; } @@ -2055,7 +2049,7 @@ public final class Formulas final double resMod = calcGeneralTraitBonus(caster, target, skill.getTraitType(), false); final double lvlBonusMod = calcLvlBonusMod(caster, target, skill); final double elementMod = calcAttributeBonus(caster, target, skill); - time = (int) Math.ceil(Util.constrain(((time * resMod * lvlBonusMod * elementMod) / statMod), (time * 0.5), time)); + time = (int) Math.ceil(Util.constrain((time * resMod * lvlBonusMod * elementMod) / statMod, time * 0.5, time)); } return time; } @@ -2080,7 +2074,7 @@ public final class Formulas */ public static boolean calcProbability(double baseChance, L2Character attacker, L2Character target, Skill skill) { - return Rnd.get(100) < ((((((skill.getMagicLevel() + baseChance) - target.getLevel()) + 30) - target.getINT()) * calcAttributeBonus(attacker, target, skill)) * calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false)); + return Rnd.get(100) < (((((skill.getMagicLevel() + baseChance) - target.getLevel()) + 30) - target.getINT()) * calcAttributeBonus(attacker, target, skill) * calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false)); } /** @@ -2117,7 +2111,7 @@ public final class Formulas if (target.isSummon()) { - result = (int) ((((pkCount * 0.375) + 1) * 60) * 4) - 150; + result = (int) (((pkCount * 0.375) + 1) * 60 * 4) - 150; if (result > 10800) { @@ -2127,11 +2121,11 @@ public final class Formulas if (pkCount < 99) { - result = (int) ((((pkCount * 0.5) + 1) * 60) * 12); + result = (int) (((pkCount * 0.5) + 1) * 60 * 12); } else if (pkCount < 180) { - result = (int) ((((pkCount * 0.125) + 37.75) * 60) * 12); + result = (int) (((pkCount * 0.125) + 37.75) * 60 * 12); } return result; @@ -2173,7 +2167,7 @@ public final class Formulas } } - return Util.constrain(((attacker.getStat().getAttackTrait(traitType) - target.getStat().getDefenceTrait(traitType)) + 1.0), 0.05, 2.0); + return Util.constrain((attacker.getStat().getAttackTrait(traitType) - target.getStat().getDefenceTrait(traitType)) + 1.0, 0.05, 2.0); } public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) @@ -2202,6 +2196,6 @@ public final class Formulas } } - return Util.constrain((weaponTraitBonus * weaknessBonus), 0.05, 2.0); + return Util.constrain(weaponTraitBonus * weaknessBonus, 0.05, 2.0); } } diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantAccEvas.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantAccEvas.java index 251aa6f383..131fd97d35 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantAccEvas.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantAccEvas.java @@ -47,11 +47,11 @@ public class FuncEnchantAccEvas extends AbstractFunction // Increases Phys.Accuracy / Mag.Accuracy for gloves if (item.getEnchantLevel() == 4) { - value += (0.2 * blessedBonus); + value += 0.2 * blessedBonus; } else { - value += (0.2 * blessedBonus * ((item.getEnchantLevel() * 2) - 9)); + value += 0.2 * blessedBonus * ((item.getEnchantLevel() * 2) - 9); } } return initVal; diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantMAtk.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantMAtk.java index 6d2f4bf82f..36bfee4eb8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantMAtk.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantMAtk.java @@ -46,11 +46,11 @@ public class FuncEnchantMAtk extends AbstractFunction // Increases Mag. Atk for chest if (item.getEnchantLevel() == 4) { - value += (1.4 * blessedBonus); + value += 1.4 * blessedBonus; } else { - value += (1.4 * blessedBonus * ((item.getEnchantLevel() * 2) - 9)); + value += 1.4 * blessedBonus * ((item.getEnchantLevel() * 2) - 9); } } return initVal; diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPAtk.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPAtk.java index 9f42fc922c..a92188307d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPAtk.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPAtk.java @@ -46,11 +46,11 @@ public class FuncEnchantPAtk extends AbstractFunction // Increases Phys.Atk for chest if (item.getEnchantLevel() == 4) { - value += (2 * blessedBonus); + value += 2 * blessedBonus; } else { - value += (2 * blessedBonus * ((item.getEnchantLevel() * 2) - 9)); + value += 2 * blessedBonus * ((item.getEnchantLevel() * 2) - 9); } } return initVal; diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPMCritRate.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPMCritRate.java index d90ffaadf8..e47272dd55 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPMCritRate.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantPMCritRate.java @@ -46,11 +46,11 @@ public class FuncEnchantPMCritRate extends AbstractFunction // Increases P. Critical Rate / magic damage for legs if (item.getEnchantLevel() == 4) { - value += (0.34 * blessedBonus); + value += 0.34 * blessedBonus; } else { - value += (0.34 * blessedBonus * ((item.getEnchantLevel() * 2) - 9)); + value += 0.34 * blessedBonus * ((item.getEnchantLevel() * 2) - 9); } } return initVal; diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantRunSpd.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantRunSpd.java index e8254220b5..18622d70cb 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantRunSpd.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/FuncEnchantRunSpd.java @@ -46,11 +46,11 @@ public abstract class FuncEnchantRunSpd extends AbstractFunction // Increases speed for feets if (item.getEnchantLevel() == 4) { - value += (0.6 * blessedBonus); + value += 0.6 * blessedBonus; } else { - value += (0.6 * blessedBonus * ((item.getEnchantLevel() * 2) - 9)); + value += 0.6 * blessedBonus * ((item.getEnchantLevel() * 2) - 9); } } return initVal; diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncMatkEvasion.java b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncMatkEvasion.java index d90f06fd2b..7f56aa95c8 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncMatkEvasion.java +++ b/trunk/java/com/l2jmobius/gameserver/model/stats/functions/formulas/FuncMatkEvasion.java @@ -43,15 +43,10 @@ public class FuncMatkEvasion extends AbstractFunction { final int level = effector.getLevel(); double value = initVal; - if (effector.isPlayer()) + // [Square(WIT)] * 3 + lvl; + value += (Math.sqrt(effector.getWIT()) * 3) + (level * 2); + if (!effector.isPlayer()) { - // [Square(WIT)] * 3 + lvl; - value += (Math.sqrt(effector.getWIT()) * 3) + (level * 2); - } - else - { - // [Square(DEX)] * 6 + lvl; - value += (Math.sqrt(effector.getWIT()) * 3) + (level * 2); if (level > 69) { value += (level - 69) + 2; diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index 65c5a5853a..ef4b77179d 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -48,13 +48,13 @@ public class ZoneCuboid extends L2ZoneForm @Override public boolean isInsideZone(int x, int y, int z) { - return (_r.contains(x, y) && (z >= _z1) && (z <= _z2)); + return _r.contains(x, y) && (z >= _z1) && (z <= _z2); } @Override public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2) { - return (_r.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1))); + return _r.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1)); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index 68939dc499..6815434cfd 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -60,7 +60,7 @@ public class ZoneCylinder extends L2ZoneForm @Override public double getDistanceToZone(int x, int y) { - return (Math.sqrt((Math.pow(_x - x, 2) + Math.pow(_y - y, 2))) - _rad); + return Math.sqrt(Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) - _rad; } // getLowZ() / getHighZ() - These two functions were added to cope with the demand of the new fishing algorithms, wich are now able to correctly place the hook in the water, thanks to getHighZ(). getLowZ() was added, considering potential future modifications. diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index bbe5e5bc7b..3c498f9e15 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -50,13 +50,13 @@ public class ZoneNPoly extends L2ZoneForm @Override public boolean isInsideZone(int x, int y, int z) { - return (_p.contains(x, y) && (z >= _z1) && (z <= _z2)); + return _p.contains(x, y) && (z >= _z1) && (z <= _z2); } @Override public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2) { - return (_p.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1))); + return _p.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1)); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2BossZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2BossZone.java index 86a8b62c39..5b7a5a930b 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2BossZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2BossZone.java @@ -162,7 +162,7 @@ public class L2BossZone extends L2ZoneType // with legal entries, do nothing. if (expirationTime == null) // legal null expirationTime entries { - if ((GameServer.dateTimeServerStarted.getTimeInMillis() > (System.currentTimeMillis() - _timeInvade))) + if (GameServer.dateTimeServerStarted.getTimeInMillis() > (System.currentTimeMillis() - _timeInvade)) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java index d148259d86..c5ee36cc90 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2ClanHallZone.java @@ -42,13 +42,13 @@ public class L2ClanHallZone extends L2ResidenceZone setResidenceId(Integer.parseInt(value)); // Register self to the correct clan hall final ClanHall hall = ClanHallManager.getInstance().getClanHallById(getResidenceId()); - if (hall == null) + if (hall != null) { - _log.warning("L2ClanHallZone: Clan hall with id " + getResidenceId() + " does not exist!"); + hall.setZone(this); } else { - hall.setZone(this); + _log.warning("L2ClanHallZone: Clan hall with id " + getResidenceId() + " does not exist!"); } } else diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java index ca41ca6a80..61bc896624 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2DamageZone.java @@ -59,7 +59,7 @@ public class L2DamageZone extends L2ZoneType _castle = null; setTargetType(InstanceType.L2Playable); // default only playabale - setSettings((ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName()))); + setSettings(ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName())); } @Override @@ -106,7 +106,7 @@ public class L2DamageZone extends L2ZoneType } final L2PcInstance player = character.getActingPlayer(); - if ((getCastle() != null) && !(getCastle().getSiege().isInProgress() && (player != null) && (player.getSiegeState() != 2))) + if ((getCastle() != null) && (!getCastle().getSiege().isInProgress() || (player == null) || (player.getSiegeState() == 2))) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java index e951291ac0..b6011be336 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java @@ -55,7 +55,7 @@ public class L2EffectZone extends L2ZoneType setTargetType(InstanceType.L2Playable); // default only playabale _bypassConditions = false; _isShowDangerIcon = true; - setSettings((ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName()))); + setSettings(ZoneManager.getSettings(getName()) == null ? new TaskZoneSettings() : ZoneManager.getSettings(getName())); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java index 1c67d51b01..8568cce539 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2OlympiadStadiumZone.java @@ -52,7 +52,7 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn public L2OlympiadStadiumZone(int id) { super(id); - setSettings((ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName()))); + setSettings(ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName())); } public final class Settings extends AbstractZoneSettings diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java index 8871fc9513..b830a0ca76 100644 --- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java +++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2SiegeZone.java @@ -48,7 +48,7 @@ public class L2SiegeZone extends L2ZoneType public L2SiegeZone(int id) { super(id); - setSettings((ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName()))); + setSettings(ZoneManager.getSettings(getName()) == null ? new Settings() : ZoneManager.getSettings(getName())); } public final class Settings extends AbstractZoneSettings @@ -133,13 +133,13 @@ public class L2SiegeZone extends L2ZoneType } getSettings().setSiegeableId(Integer.parseInt(value)); final SiegableHall hall = CHSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId()); - if (hall == null) + if (hall != null) { - _log.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!"); + hall.setSiegeZone(this); } else { - hall.setSiegeZone(this); + _log.warning("L2SiegeZone: Siegable clan hall with id " + value + " does not exist!"); } } else @@ -182,7 +182,7 @@ public class L2SiegeZone extends L2ZoneType plyer.enteredNoLanding(DISMOUNT_DELAY); } - if (!Config.ALLOW_MOUNTS_DURING_SIEGE && (plyer.isMounted())) + if (!Config.ALLOW_MOUNTS_DURING_SIEGE && plyer.isMounted()) { plyer.dismount(); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/ClientString.java b/trunk/java/com/l2jmobius/gameserver/network/ClientString.java index 795c07e292..5364c147b2 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/ClientString.java +++ b/trunk/java/com/l2jmobius/gameserver/network/ClientString.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) public @interface ClientString { - public int id(); + int id(); - public String message(); + String message(); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/L2GameClient.java b/trunk/java/com/l2jmobius/gameserver/network/L2GameClient.java index 36acfb232f..08804cc7a6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/L2GameClient.java +++ b/trunk/java/com/l2jmobius/gameserver/network/L2GameClient.java @@ -132,7 +132,7 @@ public final class L2GameClient extends MMOClient> i if (Config.CHAR_STORE_INTERVAL > 0) { - _autoSaveInDB = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new AutoSaveTask(), 300000L, (Config.CHAR_STORE_INTERVAL * 60000L)); + _autoSaveInDB = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new AutoSaveTask(), 300000L, Config.CHAR_STORE_INTERVAL * 60000L); } else { diff --git a/trunk/java/com/l2jmobius/gameserver/network/NpcStringId.java b/trunk/java/com/l2jmobius/gameserver/network/NpcStringId.java index 434f8c2820..41801e3143 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/trunk/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -36238,7 +36238,7 @@ public final class NpcStringId buildFastLookupTable(); } - private static final void buildFastLookupTable() + private static void buildFastLookupTable() { for (Field field : NpcStringId.class.getDeclaredFields()) { @@ -36262,7 +36262,7 @@ public final class NpcStringId } } - private static final int parseMessageParameters(String name) + private static int parseMessageParameters(String name) { int paramCount = 0; char c1, c2; @@ -36282,23 +36282,23 @@ public final class NpcStringId return paramCount; } - public static final NpcStringId getNpcStringId(int id) + public static NpcStringId getNpcStringId(int id) { return getNpcStringIdOrDefault(id, new NpcStringId(id)); } - public static final NpcStringId getNpcStringIdOrDefault(int id, NpcStringId defaultValue) + public static NpcStringId getNpcStringIdOrDefault(int id, NpcStringId defaultValue) { final NpcStringId nsi = getNpcStringIdInternal(id); return nsi == null ? defaultValue : nsi; } - private static final NpcStringId getNpcStringIdInternal(int id) + private static NpcStringId getNpcStringIdInternal(int id) { return VALUES.get(id); } - public static final NpcStringId getNpcStringId(String name) + public static NpcStringId getNpcStringId(String name) { try { @@ -36310,7 +36310,7 @@ public final class NpcStringId } } - public static final void reloadLocalisations() + public static void reloadLocalisations() { for (NpcStringId nsId : VALUES.values()) { @@ -36363,21 +36363,16 @@ public final class NpcStringId if (node != null) { nsId = getNpcStringId(Integer.parseInt(node.getNodeValue())); - if (nsId == null) - { - _log.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'."); - continue; - } } else { node = nnmb.getNamedItem("name"); nsId = getNpcStringId(node.getNodeValue()); - if (nsId == null) - { - _log.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'."); - continue; - } + } + if (nsId == null) + { + _log.log(Level.WARNING, "NpcStringId: Unknown NSID '" + node.getNodeValue() + "', lang '" + lang + "'."); + continue; } node = nnmb.getNamedItem("text"); diff --git a/trunk/java/com/l2jmobius/gameserver/network/SystemMessageId.java b/trunk/java/com/l2jmobius/gameserver/network/SystemMessageId.java index ed0c009149..69f8520d40 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/SystemMessageId.java +++ b/trunk/java/com/l2jmobius/gameserver/network/SystemMessageId.java @@ -15180,7 +15180,7 @@ public final class SystemMessageId buildFastLookupTable(); } - private static final void buildFastLookupTable() + private static void buildFastLookupTable() { for (Field field : SystemMessageId.class.getDeclaredFields()) { @@ -15204,7 +15204,7 @@ public final class SystemMessageId } } - private static final int parseMessageParameters(String name) + private static int parseMessageParameters(String name) { int paramCount = 0; char c1, c2; @@ -15224,18 +15224,18 @@ public final class SystemMessageId return paramCount; } - public static final SystemMessageId getSystemMessageId(int id) + public static SystemMessageId getSystemMessageId(int id) { final SystemMessageId smi = getSystemMessageIdInternal(id); return smi == null ? new SystemMessageId(id) : smi; } - private static final SystemMessageId getSystemMessageIdInternal(int id) + private static SystemMessageId getSystemMessageIdInternal(int id) { return VALUES.get(id); } - public static final SystemMessageId getSystemMessageId(String name) + public static SystemMessageId getSystemMessageId(String name) { try { @@ -15247,7 +15247,7 @@ public final class SystemMessageId } } - public static final void reloadLocalisations() + public static void reloadLocalisations() { for (SystemMessageId smId : VALUES.values()) { @@ -15300,21 +15300,16 @@ public final class SystemMessageId if (node != null) { smId = getSystemMessageId(Integer.parseInt(node.getNodeValue())); - if (smId == null) - { - _log.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'."); - continue; - } } else { node = nnmb.getNamedItem("name"); smId = getSystemMessageId(node.getNodeValue()); - if (smId == null) - { - _log.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'."); - continue; - } + } + if (smId == null) + { + _log.log(Level.WARNING, "SystemMessageId: Unknown SMID '" + node.getNodeValue() + "', lang '" + lang + "'."); + continue; } node = nnmb.getNamedItem("text"); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 3370609483..a4e0e015b5 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -256,7 +256,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket _lifeStones.put(45936, new LifeStone(GRADE_ACC, 15)); } - protected static final LifeStone getLifeStone(int itemId) + protected static LifeStone getLifeStone(int itemId) { return _lifeStones.get(itemId); } @@ -269,7 +269,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param gemStones * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones) { if (!isValid(player, item, refinerItem)) { @@ -320,7 +320,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param refinerItem * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem) { if (!isValid(player, item)) { @@ -368,7 +368,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param item * @return */ - protected static final boolean isValid(L2PcInstance player, L2ItemInstance item) + protected static boolean isValid(L2PcInstance player, L2ItemInstance item) { if (!isValid(player)) { @@ -478,7 +478,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param player * @return */ - protected static final boolean isValid(L2PcInstance player) + protected static boolean isValid(L2PcInstance player) { if (player.getPrivateStoreType() != PrivateStoreType.NONE) { @@ -526,7 +526,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param itemGrade * @return GemStone itemId based on item grade */ - protected static final int[] getGemStoneId(CrystalType itemGrade) + protected static int[] getGemStoneId(CrystalType itemGrade) { switch (itemGrade) { @@ -564,7 +564,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket * @param lifeStoneGrade * @return GemStone count based on item grade and life stone grade */ - protected static final int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade) + protected static int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade) { switch (lifeStoneGrade) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Action.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Action.java index 15923b0f79..e11427322d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Action.java @@ -150,7 +150,7 @@ public final class Action extends L2GameClientPacket } case 1: { - if (!activeChar.isGM() && !(obj.isNpc() && Config.ALT_GAME_VIEWNPC)) + if (!activeChar.isGM() && (!obj.isNpc() || !Config.ALT_GAME_VIEWNPC)) { obj.onAction(activeChar, false); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java index e6ef4fcf8a..dcf624b67d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Attack.java @@ -118,16 +118,13 @@ public final class Attack extends L2GameClientPacket { target.onAction(activeChar); } + else if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) + { + target.onForcedAttack(activeChar); + } else { - if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) - { - target.onForcedAttack(activeChar); - } - else - { - activeChar.sendPacket(ActionFailed.STATIC_PACKET); - } + activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java index d347231b7c..b384bd8118 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/AttackRequest.java @@ -108,16 +108,13 @@ public final class AttackRequest extends L2GameClientPacket { target.onAction(activeChar); } + else if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) + { + target.onForcedAttack(activeChar); + } else { - if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) - { - target.onForcedAttack(activeChar); - } - else - { - activeChar.sendPacket(ActionFailed.STATIC_PACKET); - } + activeChar.sendPacket(ActionFailed.STATIC_PACKET); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java index 27623625ba..24effba540 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java @@ -53,7 +53,7 @@ public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket } player.setInVehiclePosition(new Location(_x, _y, _z)); player.setHeading(_heading); - player.broadcastPacket((new StopMoveInVehicle(player, _boatId))); + player.broadcastPacket(new StopMoveInVehicle(player, _boatId)); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index e17c6b01a2..6236a0a8f9 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -258,7 +258,7 @@ public final class CharacterCreate extends L2GameClientPacket break; } } - newChar = L2PcInstance.create(template, getClient().getAccountName(), _name, (new PcAppearance(_face, _hairColor, _hairStyle, _sex != 0))); + newChar = L2PcInstance.create(template, getClient().getAccountName(), _name, new PcAppearance(_face, _hairColor, _hairStyle, _sex != 0)); } // HP and MP are at maximum and CP is zero by default. diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java index 5aad888173..5412187839 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/CharacterSelect.java @@ -123,7 +123,7 @@ public class CharacterSelect extends L2GameClientPacket if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_BALANCE_ONLINE_PLAYERS) { - if (info.isGood() && (L2World.getInstance().getAllGoodPlayersCount() >= ((L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) + if (info.isGood() && (L2World.getInstance().getAllGoodPlayersCount() >= (L2World.getInstance().getAllEvilPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))) { final NpcHtmlMessage msg = new NpcHtmlMessage(); msg.setFile(info.getHtmlPrefix(), "html/mods/Faction/ExceededOnlineLimit.htm"); @@ -132,7 +132,7 @@ public class CharacterSelect extends L2GameClientPacket client.sendPacket(msg); return; } - if (info.isEvil() && (L2World.getInstance().getAllEvilPlayersCount() >= ((L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT)))) + if (info.isEvil() && (L2World.getInstance().getAllEvilPlayersCount() >= (L2World.getInstance().getAllGoodPlayersCount() + Config.FACTION_BALANCE_PLAYER_EXCEED_LIMIT))) { final NpcHtmlMessage msg = new NpcHtmlMessage(); msg.setFile(info.getHtmlPrefix(), "html/mods/Faction/ExceededOnlineLimit.htm"); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java index a5d8dd2f1f..2905c33171 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/DlgAnswer.java @@ -84,7 +84,7 @@ public final class DlgAnswer extends L2GameClientPacket { if (Config.GMAUDIT) { - GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target")); + GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); } AdminCommandHandler.getInstance().getHandler(command).useAdminCommand(cmd, activeChar); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index b1a0e13022..5c70ba63c7 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -110,12 +110,12 @@ import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList; */ public class EnterWorld extends L2GameClientPacket { - private final static String _C__11_ENTERWORLD = "[C] 11 EnterWorld"; + private static final String _C__11_ENTERWORLD = "[C] 11 EnterWorld"; private final int[][] tracert = new int[5][4]; - private final static double MIN_HP = 0.5; + private static final double MIN_HP = 0.5; private static final int COMBAT_FLAG = 9819; - private final static int ERTHEIA_INTRO_FOR_ERTHEIA_USM_ID = 147; - private final static int ERTHEIA_INTRO_FOR_OTHERS_USM_ID = 148; + private static final int ERTHEIA_INTRO_FOR_ERTHEIA_USM_ID = 147; + private static final int ERTHEIA_INTRO_FOR_OTHERS_USM_ID = 148; @Override protected void readImpl() diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 71f8c4335f..8fa92bb403 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -209,7 +209,7 @@ public class MultiSellChoose extends L2GameClientPacket { // if this is not a list that maintains enchantment, check the count of all items that have the given id. // otherwise, check only the count of items with exactly the needed enchantment level - final long required = ((Config.ALT_BLACKSMITH_USE_RECIPES || !e.getMaintainIngredient()) ? (e.getItemCount() * _amount) : e.getItemCount()); + final long required = (Config.ALT_BLACKSMITH_USE_RECIPES || !e.getMaintainIngredient()) ? (e.getItemCount() * _amount) : e.getItemCount(); if (inv.getInventoryItemCount(e.getItemId(), (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) ? e.getEnchantLevel() : -1, false) < required) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NEED_S2_S1_S); @@ -260,114 +260,107 @@ public class MultiSellChoose extends L2GameClientPacket // if it's a stackable item, just reduce the amount from the first (only) instance that is found in the inventory if (itemToTake.isStackable()) { - if (!player.destroyItem("Multisell", itemToTake.getObjectId(), (e.getItemCount() * _amount), player.getTarget(), true)) + if (!player.destroyItem("Multisell", itemToTake.getObjectId(), e.getItemCount() * _amount, player.getTarget(), true)) { player.setMultiSell(null); return; } } - else + // a) if enchantment is maintained, then get a list of items that exactly match this enchantment + else if (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) { - // for non-stackable items, one of two scenarios are possible: - // a) list maintains enchantment: get the instances that exactly match the requested enchantment level - // b) list does not maintain enchantment: get the instances with the LOWEST enchantment level - - // a) if enchantment is maintained, then get a list of items that exactly match this enchantment - if (list.getMaintainEnchantment() || (e.getEnchantLevel() > 0)) + // loop through this list and remove (one by one) each item until the required amount is taken. + final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false); + for (int i = 0; i < (e.getItemCount() * _amount); i++) { - // loop through this list and remove (one by one) each item until the required amount is taken. - final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false); - for (int i = 0; i < (e.getItemCount() * _amount); i++) + if (inventoryContents[i].isAugmented()) { - if (inventoryContents[i].isAugmented()) - { - augmentation.add(inventoryContents[i].getAugmentation()); - } - if (inventoryContents[i].getElementals() != null) - { - elemental = inventoryContents[i].getElementals(); - } - if (!player.destroyItem("Multisell", inventoryContents[i].getObjectId(), 1, player.getTarget(), true)) - { - player.setMultiSell(null); - return; - } - if (inventoryContents[i].getCommonSoulCrystalOptions() != null) - { - commonSoulCrystalOptions = inventoryContents[i].getCommonSoulCrystalOptions(); - } - if (inventoryContents[i].getSpecialSoulCrystalOption() != null) - { - specialSoulCrystalOption = inventoryContents[i].getSpecialSoulCrystalOption(); - } + augmentation.add(inventoryContents[i].getAugmentation()); + } + if (inventoryContents[i].getElementals() != null) + { + elemental = inventoryContents[i].getElementals(); + } + if (!player.destroyItem("Multisell", inventoryContents[i].getObjectId(), 1, player.getTarget(), true)) + { + player.setMultiSell(null); + return; + } + if (inventoryContents[i].getCommonSoulCrystalOptions() != null) + { + commonSoulCrystalOptions = inventoryContents[i].getCommonSoulCrystalOptions(); + } + if (inventoryContents[i].getSpecialSoulCrystalOption() != null) + { + specialSoulCrystalOption = inventoryContents[i].getSpecialSoulCrystalOption(); } } - else - // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level + } + else + // b) enchantment is not maintained. Get the instances with the LOWEST enchantment level + { + // NOTE: There are 2 ways to achieve the above goal. + // 1) Get all items that have the correct itemId, loop through them until the lowest enchantment + // level is found. Repeat all this for the next item until proper count of items is reached. + // 2) Get all items that have the correct itemId, sort them once based on enchantment level, + // and get the range of items that is necessary. + // Method 1 is faster for a small number of items to be exchanged. + // Method 2 is faster for large amounts. + // + // EXPLANATION: + // Worst case scenario for algorithm 1 will make it run in a number of cycles given by: + // m*(2n-m+1)/2 where m is the number of items to be exchanged and n is the total + // number of inventory items that have a matching id. + // With algorithm 2 (sort), sorting takes n*log(n) time and the choice is done in a single cycle + // for case b (just grab the m first items) or in linear time for case a (find the beginning of items + // with correct enchantment, index x, and take all items from x to x+m). + // Basically, whenever m > log(n) we have: m*(2n-m+1)/2 = (2nm-m*m+m)/2 > + // (2nlogn-logn*logn+logn)/2 = nlog(n) - log(n*n) + log(n) = nlog(n) + log(n/n*n) = + // nlog(n) + log(1/n) = nlog(n) - log(n) = (n-1)log(n) + // So for m < log(n) then m*(2n-m+1)/2 > (n-1)log(n) and m*(2n-m+1)/2 > nlog(n) + // + // IDEALLY: + // In order to best optimize the performance, choose which algorithm to run, based on whether 2^m > n + // if ( (2<<(e.getItemCount()// _amount)) < inventoryContents.length ) + // // do Algorithm 1, no sorting + // else + // // do Algorithm 2, sorting + // + // CURRENT IMPLEMENTATION: + // In general, it is going to be very rare for a person to do a massive exchange of non-stackable items + // For this reason, we assume that algorithm 1 will always suffice and we keep things simple. + // If, in the future, it becomes necessary that we optimize, the above discussion should make it clear + // what optimization exactly is necessary (based on the comments under "IDEALLY"). + // + + // choice 1. Small number of items exchanged. No sorting. + for (int i = 1; i <= (e.getItemCount() * _amount); i++) { - // NOTE: There are 2 ways to achieve the above goal. - // 1) Get all items that have the correct itemId, loop through them until the lowest enchantment - // level is found. Repeat all this for the next item until proper count of items is reached. - // 2) Get all items that have the correct itemId, sort them once based on enchantment level, - // and get the range of items that is necessary. - // Method 1 is faster for a small number of items to be exchanged. - // Method 2 is faster for large amounts. - // - // EXPLANATION: - // Worst case scenario for algorithm 1 will make it run in a number of cycles given by: - // m*(2n-m+1)/2 where m is the number of items to be exchanged and n is the total - // number of inventory items that have a matching id. - // With algorithm 2 (sort), sorting takes n*log(n) time and the choice is done in a single cycle - // for case b (just grab the m first items) or in linear time for case a (find the beginning of items - // with correct enchantment, index x, and take all items from x to x+m). - // Basically, whenever m > log(n) we have: m*(2n-m+1)/2 = (2nm-m*m+m)/2 > - // (2nlogn-logn*logn+logn)/2 = nlog(n) - log(n*n) + log(n) = nlog(n) + log(n/n*n) = - // nlog(n) + log(1/n) = nlog(n) - log(n) = (n-1)log(n) - // So for m < log(n) then m*(2n-m+1)/2 > (n-1)log(n) and m*(2n-m+1)/2 > nlog(n) - // - // IDEALLY: - // In order to best optimize the performance, choose which algorithm to run, based on whether 2^m > n - // if ( (2<<(e.getItemCount()// _amount)) < inventoryContents.length ) - // // do Algorithm 1, no sorting - // else - // // do Algorithm 2, sorting - // - // CURRENT IMPLEMENTATION: - // In general, it is going to be very rare for a person to do a massive exchange of non-stackable items - // For this reason, we assume that algorithm 1 will always suffice and we keep things simple. - // If, in the future, it becomes necessary that we optimize, the above discussion should make it clear - // what optimization exactly is necessary (based on the comments under "IDEALLY"). - // + final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false); - // choice 1. Small number of items exchanged. No sorting. - for (int i = 1; i <= (e.getItemCount() * _amount); i++) + itemToTake = inventoryContents[0]; + // get item with the LOWEST enchantment level from the inventory... + // +0 is lowest by default... + if (itemToTake.getEnchantLevel() > 0) { - final L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false); - - itemToTake = inventoryContents[0]; - // get item with the LOWEST enchantment level from the inventory... - // +0 is lowest by default... - if (itemToTake.getEnchantLevel() > 0) + for (L2ItemInstance item : inventoryContents) { - for (L2ItemInstance item : inventoryContents) + if ((item.getEnchantLevel() < itemToTake.getEnchantLevel()) && (item.getEnchantLevel() >= e.getEnchantLevel())) { - if ((item.getEnchantLevel() < itemToTake.getEnchantLevel()) && (item.getEnchantLevel() >= e.getEnchantLevel())) + itemToTake = item; + // nothing will have enchantment less than 0. If a zero-enchanted + // item is found, just take it + if (itemToTake.getEnchantLevel() == 0) { - itemToTake = item; - // nothing will have enchantment less than 0. If a zero-enchanted - // item is found, just take it - if (itemToTake.getEnchantLevel() == 0) - { - break; - } + break; } } } - if (!player.destroyItem("Multisell", itemToTake.getObjectId(), 1, player.getTarget(), true)) - { - player.setMultiSell(null); - return; - } + } + if (!player.destroyItem("Multisell", itemToTake.getObjectId(), 1, player.getTarget(), true)) + { + player.setMultiSell(null); + return; } } } @@ -391,7 +384,7 @@ public class MultiSellChoose extends L2GameClientPacket } // Calculate chance - matched = (itemRandom < (cumulativeChance += e.getChance())); + matched = itemRandom < (cumulativeChance += e.getChance()); if (!matched) { continue; diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java index 07d2b45b6d..9794df14e2 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java @@ -512,7 +512,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket } } - public final static void showSubSkillList(L2PcInstance activeChar) + public static void showSubSkillList(L2PcInstance activeChar) { final List skills = SkillTreesData.getInstance().getAvailableSubClassSkills(activeChar); if (!skills.isEmpty()) @@ -525,7 +525,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket } } - public final static void showDualSkillList(L2PcInstance activeChar) + public static void showDualSkillList(L2PcInstance activeChar) { final List skills = SkillTreesData.getInstance().getAvailableDualClassSkills(activeChar); if (!skills.isEmpty()) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java index 5895e4c173..da209c23c8 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkillInfo.java @@ -85,7 +85,7 @@ public final class RequestAcquireSkillInfo extends L2GameClientPacket // Hack check. Doesn't apply to all Skill Types final int prevSkillLevel = activeChar.getSkillLevel(_id); - if ((prevSkillLevel > 0) && !((_skillType == AcquireSkillType.TRANSFER) || (_skillType == AcquireSkillType.SUBPLEDGE))) + if ((prevSkillLevel > 0) && (_skillType != AcquireSkillType.TRANSFER) && (_skillType != AcquireSkillType.SUBPLEDGE)) { if (prevSkillLevel == _level) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index 9a7e5f13f2..3747561276 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -84,8 +84,8 @@ public final class RequestActionUse extends L2GameClientPacket protected void readImpl() { _actionId = readD(); - _ctrlPressed = (readD() == 1); - _shiftPressed = (readC() == 1); + _ctrlPressed = readD() == 1; + _shiftPressed = readC() == 1; } @Override @@ -124,7 +124,7 @@ public final class RequestActionUse extends L2GameClientPacket } // Don't allow to do some action if player is transformed - if (activeChar.isTransformed() && !(Arrays.binarySearch((activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST), _actionId) >= 0)) + if (activeChar.isTransformed() && (Arrays.binarySearch(activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST, _actionId) < 0)) { sendPacket(ActionFailed.STATIC_PACKET); _log.warning("Player " + activeChar + " used action which he does not have! Id = " + _actionId + " transform: " + activeChar.getTransformation()); @@ -144,7 +144,7 @@ public final class RequestActionUse extends L2GameClientPacket } else { - activeChar.getAI().setNextAction((new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> useSit(activeChar, target)))); + activeChar.getAI().setNextAction(new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> useSit(activeChar, target))); } break; } @@ -463,7 +463,7 @@ public final class RequestActionUse extends L2GameClientPacket case 80: case 81: { - if ((activeChar.getParty() != null) && (activeChar.getTarget() != null) && (activeChar.getTarget().isCharacter())) + if ((activeChar.getParty() != null) && (activeChar.getTarget() != null) && activeChar.getTarget().isCharacter()) { activeChar.getParty().addTacticalSign(_actionId - 77, (L2Character) activeChar.getTarget()); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java index 7f46bda0ef..f6fe9b0102 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java @@ -104,7 +104,7 @@ public final class RequestBuyItem extends L2GameClientPacket L2Character merchant = null; if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { - if (!(target instanceof L2MerchantInstance) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) + if (!(target instanceof L2MerchantInstance) || !player.isInsideRadius(target, INTERACTION_DISTANCE, true, false) || (player.getInstanceId() != target.getInstanceId())) { sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java index b14bcede20..97475fda0b 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBuySeed.java @@ -126,7 +126,7 @@ public class RequestBuySeed extends L2GameClientPacket } // Calculate price - totalPrice += (sp.getPrice() * ih.getCount()); + totalPrice += sp.getPrice() * ih.getCount(); if (totalPrice > MAX_ADENA) { Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + MAX_ADENA + " adena worth of goods.", Config.DEFAULT_PUNISH); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java index a7d0f9aaa8..3fb13d5841 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java @@ -164,7 +164,7 @@ public final class RequestBypassToServer extends L2GameClientPacket { if (Config.GMAUDIT) { - GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target")); + GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); } ach.useAdminCommand(_command, activeChar); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeAttributeItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeAttributeItem.java index 7e4614572a..c7efe1032b 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeAttributeItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestChangeAttributeItem.java @@ -117,13 +117,13 @@ public class RequestChangeAttributeItem extends L2GameClientPacket player.sendPacket(new ExStorageMaxCount(player)); final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(item); - if (player.getInventory().getItemByObjectId(_attributeOID) == null) + if (player.getInventory().getItemByObjectId(_attributeOID) != null) { - iu.addRemovedItem(attribute); + iu.addModifiedItem(attribute); } else { - iu.addModifiedItem(attribute); + iu.addRemovedItem(attribute); } player.sendPacket(iu); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java index 877259d602..b2ec526615 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java @@ -65,7 +65,7 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket } // Check if leader of the clan who owns the castle? - if ((castle.getOwnerId() != activeChar.getClanId()) || (!activeChar.isClanLeader())) + if ((castle.getOwnerId() != activeChar.getClanId()) || !activeChar.isClanLeader()) { return; } @@ -89,12 +89,9 @@ public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket return; } } - else + else if (castle.getSiege().checkIsDefenderWaiting(clan) || castle.getSiege().checkIsDefender(clan)) { - if ((castle.getSiege().checkIsDefenderWaiting(clan)) || (castle.getSiege().checkIsDefender(clan))) - { - castle.getSiege().removeSiegeClan(_clanId); - } + castle.getSiege().removeSiegeClan(_clanId); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index a857df1c62..6eab8e23f8 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -216,13 +216,12 @@ public final class RequestCrystallizeItem extends L2GameClientPacket { sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(itemToRemove.getEnchantLevel()); - sm.addItemName(itemToRemove); } else { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(itemToRemove); } + sm.addItemName(itemToRemove); activeChar.sendPacket(sm); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java index cde444caeb..477dad1e14 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestCursedWeaponList.java @@ -47,12 +47,7 @@ public class RequestCursedWeaponList extends L2GameClientPacket } // send a ExCursedWeaponList :p - final List list = new ArrayList<>(); - for (int id : CursedWeaponsManager.getInstance().getCursedWeaponsIds()) - { - list.add(id); - } - + final List list = new ArrayList<>(CursedWeaponsManager.getInstance().getCursedWeaponsIds()); activeChar.sendPacket(new ExCursedWeaponList(list)); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 69bff41028..5bea1b2b96 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -166,19 +166,18 @@ public final class RequestDestroyItem extends L2GameClientPacket if (itemToRemove.isEquipped()) { + final SystemMessage sm; if (itemToRemove.getEnchantLevel() > 0) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); + sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(itemToRemove.getEnchantLevel()); - sm.addItemName(itemToRemove); - activeChar.sendPacket(sm); } else { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(itemToRemove); - activeChar.sendPacket(sm); + sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } + sm.addItemName(itemToRemove); + activeChar.sendPacket(sm); final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot()); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bc7f49b197..fe8b683c9a 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -72,12 +72,12 @@ public final class RequestDropItem extends L2GameClientPacket final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId); - if ((item == null) || (_count == 0) || !activeChar.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && activeChar.havePetInvItems()) || activeChar.isInsideZone(ZoneId.NO_ITEM_DROP)) + if ((item == null) || (_count == 0) || !activeChar.validateItemManipulation(_objectId, "drop") || (!Config.ALLOW_DISCARDITEM && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) || (!item.isDropable() && (!activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) || !Config.GM_TRADE_RESTRICTED_ITEMS)) || ((item.getItemType() == EtcItemType.PET_COLLAR) && activeChar.havePetInvItems()) || activeChar.isInsideZone(ZoneId.NO_ITEM_DROP)) { activeChar.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - if (item.isQuestItem() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS)) + if (item.isQuestItem() && (!activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) || !Config.GM_TRADE_RESTRICTED_ITEMS)) { return; } @@ -192,7 +192,7 @@ public final class RequestDropItem extends L2GameClientPacket activeChar.sendPacket(iu); activeChar.broadcastUserInfo(); - activeChar.sendPacket((new ItemList(activeChar, true))); + activeChar.sendPacket(new ItemList(activeChar, true)); } final L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false); @@ -206,7 +206,7 @@ public final class RequestDropItem extends L2GameClientPacket if (activeChar.isGM()) { - final String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); + final String target = activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"; GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "Drop", target, "(id: " + dropedItem.getId() + " name: " + dropedItem.getItemName() + " objId: " + dropedItem.getObjectId() + " x: " + activeChar.getX() + " y: " + activeChar.getY() + " z: " + activeChar.getZ() + ")"); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java index c8f0bd9786..047a59048a 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelAnswerStart.java @@ -78,7 +78,6 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket msg1.addString(requestor.getName()); msg2 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_DUEL_AGAINST_THEIR_PARTY_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS); - msg2.addString(player.getName()); } else { @@ -86,13 +85,13 @@ public final class RequestDuelAnswerStart extends L2GameClientPacket msg1.addString(requestor.getName()); msg2 = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_A_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS); - msg2.addString(player.getName()); } + msg2.addString(player.getName()); player.sendPacket(msg1); requestor.sendPacket(msg2); - DuelManager.getInstance().addDuel(requestor, player, _partyDuel == 1 ? true : false); + DuelManager.getInstance().addDuel(requestor, player, _partyDuel == 1); } else if (_response == -1) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java index 71362a1f46..b3a157b57c 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestDuelStart.java @@ -135,33 +135,29 @@ public final class RequestDuelStart extends L2GameClientPacket } } } - else - // 1vs1 duel + else if (!targetChar.isProcessingRequest()) { - if (!targetChar.isProcessingRequest()) + activeChar.onTransactionRequest(targetChar); + targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); + + if (Config.DEBUG) { - activeChar.onTransactionRequest(targetChar); - targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel)); - - if (Config.DEBUG) - { - _log.fine(activeChar.getName() + " requested a duel with " + targetChar.getName()); - } - - SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); - msg.addString(targetChar.getName()); - activeChar.sendPacket(msg); - - msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CHALLENGED_YOU_TO_A_DUEL); - msg.addString(activeChar.getName()); - targetChar.sendPacket(msg); - } - else - { - final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); - msg.addString(targetChar.getName()); - activeChar.sendPacket(msg); + _log.fine(activeChar.getName() + " requested a duel with " + targetChar.getName()); } + + SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL); + msg.addString(targetChar.getName()); + activeChar.sendPacket(msg); + + msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CHALLENGED_YOU_TO_A_DUEL); + msg.addString(activeChar.getName()); + targetChar.sendPacket(msg); + } + else + { + final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ON_ANOTHER_TASK_PLEASE_TRY_AGAIN_LATER); + msg.addString(targetChar.getName()); + activeChar.sendPacket(msg); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 30a9ed01ec..e0b71ac523 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -235,7 +235,7 @@ public final class RequestEnchantItem extends L2GameClientPacket } } - if ((item.isArmor()) && (item.getEnchantLevel() >= 4) && item.isEquipped()) + if (item.isArmor() && (item.getEnchantLevel() >= 4) && item.isEquipped()) { enchant4Skill = it.getEnchant4Skill(); if (enchant4Skill != null) @@ -274,19 +274,18 @@ public final class RequestEnchantItem extends L2GameClientPacket // unequip item on enchant failure to avoid item skills stack if (item.isEquipped()) { + final SystemMessage sm; if (item.getEnchantLevel() > 0) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); + sm = SystemMessage.getSystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED); sm.addInt(item.getEnchantLevel()); - sm.addItemName(item); - activeChar.sendPacket(sm); } else { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); - sm.addItemName(item); - activeChar.sendPacket(sm); + sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED); } + sm.addItemName(item); + activeChar.sendPacket(sm); final L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot()); for (L2ItemInstance itm : unequiped) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java index 6305dd7993..f2dbff1303 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAddEnchantScrollItem.java @@ -72,7 +72,7 @@ public class RequestExAddEnchantScrollItem extends L2GameClientPacket } final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll); - if ((scrollTemplate == null)) + if (scrollTemplate == null) { // message may be custom activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java index 1d570b5109..219b6cd2c4 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAskJoinMPCC.java @@ -97,30 +97,27 @@ public final class RequestExAskJoinMPCC extends L2GameClientPacket sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_AUTHORITY_TO_INVITE_SOMEONE_TO_THE_COMMAND_CHANNEL); activeChar.sendPacket(sm); } - else + // target in a party? + else if (player.isInParty()) { - // target in a party? - if (player.isInParty()) + // targets party already in a CChannel? + if (player.getParty().isInCommandChannel()) { - // targets party already in a CChannel? - if (player.getParty().isInCommandChannel()) - { - sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_IS_ALREADY_A_MEMBER_OF_THE_COMMAND_CHANNEL); - sm.addString(player.getName()); - activeChar.sendPacket(sm); - } - else - { - // ready to open a new CC - // send request to targets Party's PartyLeader - askJoinMPCC(activeChar, player); - } + sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_PARTY_IS_ALREADY_A_MEMBER_OF_THE_COMMAND_CHANNEL); + sm.addString(player.getName()); + activeChar.sendPacket(sm); } else { - activeChar.sendMessage(player.getName() + " doesn't have party and cannot be invited to Command Channel."); + // ready to open a new CC + // send request to targets Party's PartyLeader + askJoinMPCC(activeChar, player); } } + else + { + activeChar.sendMessage(player.getName() + " doesn't have party and cannot be invited to Command Channel."); + } } else { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAutoFish.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAutoFish.java index cef0ac1c38..e129346150 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAutoFish.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExAutoFish.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public class RequestExAutoFish extends L2GameClientPacket { - private final static SkillHolder FISHING_SKILL = new SkillHolder(1312, 1); + private static final SkillHolder FISHING_SKILL = new SkillHolder(1312, 1); public RequestExAutoFish() { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 955110e156..8a4f9ae9f3 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -219,12 +219,6 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_ELEMENTAL_POWER_HAS_BEEN_ADDED_SUCCESSFULLY_TO_S1); } - sm.addItemName(item); - sm.addElemental(realElement); - if (item.isArmor()) - { - sm.addElemental(Elementals.getOppositeElement(realElement)); - } } else { @@ -237,12 +231,12 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket sm = SystemMessage.getSystemMessage(SystemMessageId.S3_ELEMENTAL_POWER_HAS_BEEN_ADDED_SUCCESSFULLY_TO_S1_S2); } sm.addInt(item.getEnchantLevel()); - sm.addItemName(item); - sm.addElemental(realElement); - if (item.isArmor()) - { - sm.addElemental(Elementals.getOppositeElement(realElement)); - } + } + sm.addItemName(item); + sm.addElemental(realElement); + if (item.isArmor()) + { + sm.addElemental(Elementals.getOppositeElement(realElement)); } player.sendPacket(sm); if (item.isEquipped()) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index 94f6edaf82..d29d1a92fd 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -131,20 +131,17 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V2; - } - else - { - reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V3; - } + reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V3; } final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId); @@ -154,7 +151,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket return; } - final int requiredAdena = (esd.getAdenaCost() * costMultiplier); + final int requiredAdena = esd.getAdenaCost() * costMultiplier; if (player.getInventory().getAdena() < requiredAdena) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL); @@ -253,20 +250,17 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V2; - } - else - { - reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V3; - } + reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V3; } final EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl); final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId); @@ -378,20 +372,17 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V2; - } - else - { - reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V3; - } + reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V3; } final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId); @@ -469,15 +460,15 @@ public final class RequestExEnchantSkill extends L2GameClientPacket player.sendPacket(new UserInfo(player)); + final SystemMessage sm; if (levelPenalty == 0) { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN); + sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_WILL_REMAIN); sm.addSkillName(_skillId); - player.sendPacket(sm); } else { - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2); + sm = SystemMessage.getSystemMessage(SystemMessageId.ENCHANT_SKILL_ROUTE_CHANGE_WAS_SUCCESSFUL_LV_OF_ENCHANT_SKILL_S1_HAS_BEEN_DECREASED_BY_S2); sm.addSkillName(_skillId); if (_skillLvl > 1000) @@ -488,8 +479,8 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { sm.addInt(0); } - player.sendPacket(sm); } + player.sendPacket(sm); player.sendSkillList(); final int afterEnchantSkillLevel = player.getSkillLevel(_skillId); player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel)); @@ -508,20 +499,17 @@ public final class RequestExEnchantSkill extends L2GameClientPacket { reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL; } + else if (_elvl == 0) + { + reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL; + } + else if (_elvl == 1) + { + reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V2; + } else { - if (_elvl == 0) - { - reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL; - } - else if (_elvl == 1) - { - reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V2; - } - else - { - reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V3; - } + reqItemId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V3; } final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId); if (beforeEnchantSkillLevel != s.getMinSkillLevel(_skillLvl)) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java index aa18c4b256..00f228456d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java @@ -49,13 +49,13 @@ public final class RequestExPledgeCrestLarge extends L2GameClientPacket if (i < 4) { final byte[] fullChunk = new byte[14336]; - System.arraycopy(data, (14336 * i), fullChunk, 0, 14336); + System.arraycopy(data, 14336 * i, fullChunk, 0, 14336); sendPacket(new ExPledgeEmblem(_crestId, fullChunk, _clanId, i)); } else { final byte[] lastChunk = new byte[8320]; - System.arraycopy(data, (14336 * i), lastChunk, 0, 8320); + System.arraycopy(data, 14336 * i, lastChunk, 0, 8320); sendPacket(new ExPledgeEmblem(_crestId, lastChunk, _clanId, i)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 357b8fa86f..553ff04a07 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -85,29 +85,20 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_S_S3_ATTRIBUTE_HAS_BEEN_REMOVED); } sm.addInt(targetItem.getEnchantLevel()); - sm.addItemName(targetItem); - if (targetItem.isArmor()) - { - sm.addElemental(realElement); - sm.addElemental(Elementals.getOppositeElement(realElement)); - } + } + else if (targetItem.isArmor()) + { + sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_WAS_REMOVED_AND_RESISTANCE_TO_S3_WAS_DECREASED); } else { - if (targetItem.isArmor()) - { - sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_WAS_REMOVED_AND_RESISTANCE_TO_S3_WAS_DECREASED); - } - else - { - sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_BEEN_REMOVED); - } - sm.addItemName(targetItem); - if (targetItem.isArmor()) - { - sm.addElemental(realElement); - sm.addElemental(Elementals.getOppositeElement(realElement)); - } + sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S_S2_ATTRIBUTE_HAS_BEEN_REMOVED); + } + sm.addItemName(targetItem); + if (targetItem.isArmor()) + { + sm.addElemental(realElement); + sm.addElemental(Elementals.getOppositeElement(realElement)); } activeChar.sendPacket(sm); activeChar.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element)); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java index 78e19ba484..f16fab2286 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestExRqItemLink.java @@ -53,12 +53,9 @@ public class RequestExRqItemLink extends L2GameClientPacket { client.sendPacket(new ExRpItemLink((L2ItemInstance) object)); } - else + else if (Config.DEBUG) { - if (Config.DEBUG) - { - _log.info(getClient() + " requested item link for item which wasnt published! ID:" + _objectId); - } + _log.info(getClient() + " requested item link for item which wasnt published! ID:" + _objectId); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java index ed03882348..1f1861364b 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestItemList.java @@ -37,7 +37,7 @@ public final class RequestItemList extends L2GameClientPacket { if ((getClient() != null) && (getClient().getActiveChar() != null) && !getClient().getActiveChar().isInventoryDisabled()) { - sendPacket((new ItemList(getClient().getActiveChar(), true))); + sendPacket(new ItemList(getClient().getActiveChar(), true)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java index f6c54541fb..0724ae67cc 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java @@ -68,7 +68,7 @@ public final class RequestJoinPledge extends L2GameClientPacket } final String pledgeName = activeChar.getClan().getName(); - final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null); + final String subPledgeName = activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null; final String askjoinName = activeChar.getName(); target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName, askjoinName)); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 275a9758e7..7f4796b499 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -119,7 +119,7 @@ public final class RequestMagicSkillUse extends L2GameClientPacket } // Stop if use self-buff (except if on AirShip or Boat). - if ((skill.isContinuous() && !skill.isDebuff() && (skill.getTargetType() == L2TargetType.SELF)) && (!activeChar.isInAirShip() || !activeChar.isInBoat())) + if (skill.isContinuous() && !skill.isDebuff() && (skill.getTargetType() == L2TargetType.SELF) && (!activeChar.isInAirShip() || !activeChar.isInBoat())) { activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, activeChar.getLocation()); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java index 12a112e9b5..7afcd14c60 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java @@ -86,7 +86,7 @@ public class RequestPackageSend extends L2GameClientPacket } final L2Npc manager = player.getLastFolkNPC(); - if (((manager == null) || !player.isInsideRadius(manager, L2Npc.INTERACTION_DISTANCE, false, false))) + if ((manager == null) || !player.isInsideRadius(manager, L2Npc.INTERACTION_DISTANCE, false, false)) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java index e1ef5c9e33..1ef4d5b8f8 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPartyMatchConfig.java @@ -89,7 +89,7 @@ public final class RequestPartyMatchConfig extends L2GameClientPacket PartyMatchWaitingList.getInstance().addPlayer(_activeChar); // Send Room list - _activeChar.sendPacket((new ListPartyWating(_activeChar, _auto, _loc, _lvl))); + _activeChar.sendPacket(new ListPartyWating(_activeChar, _auto, _loc, _lvl)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 6559ddd173..88d00e34a7 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -66,31 +66,28 @@ public final class RequestPetitionCancel extends L2GameClientPacket activeChar.sendPacket(SystemMessageId.YOUR_PETITION_IS_BEING_PROCESSED); } } - else + else if (PetitionManager.getInstance().isPlayerPetitionPending(activeChar)) { - if (PetitionManager.getInstance().isPlayerPetitionPending(activeChar)) + if (PetitionManager.getInstance().cancelActivePetition(activeChar)) { - if (PetitionManager.getInstance().cancelActivePetition(activeChar)) - { - final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar); - - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY); - sm.addString(String.valueOf(numRemaining)); - activeChar.sendPacket(sm); - - // Notify all GMs that the player's pending petition has been cancelled. - AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), ChatType.HERO_VOICE, "Petition System", (activeChar.getName() + " has canceled a pending petition."))); - } - else - { - activeChar.sendPacket(SystemMessageId.FAILED_TO_CANCEL_PETITION_PLEASE_TRY_AGAIN_LATER); - } + final int numRemaining = Config.MAX_PETITIONS_PER_PLAYER - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar); + + final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_PETITION_WAS_CANCELED_YOU_MAY_SUBMIT_S1_MORE_PETITION_S_TODAY); + sm.addString(String.valueOf(numRemaining)); + activeChar.sendPacket(sm); + + // Notify all GMs that the player's pending petition has been cancelled. + AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), ChatType.HERO_VOICE, "Petition System", (activeChar.getName() + " has canceled a pending petition."))); } else { - activeChar.sendPacket(SystemMessageId.YOU_HAVE_NOT_SUBMITTED_A_PETITION); + activeChar.sendPacket(SystemMessageId.FAILED_TO_CANCEL_PETITION_PLEASE_TRY_AGAIN_LATER); } } + else + { + activeChar.sendPacket(SystemMessageId.YOU_HAVE_NOT_SUBMITTED_A_PETITION); + } } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java index 0a54d76fce..6b57b7e0ed 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java @@ -48,7 +48,7 @@ public class RequestPledgeRecruitApplyInfo extends L2GameClientPacket { status = ClanEntryStatus.ORDERED; } - else if ((activeChar.getClan() == null) && (ClanEntryManager.getInstance().isPlayerRegistred(activeChar.getObjectId()))) + else if ((activeChar.getClan() == null) && ClanEntryManager.getInstance().isPlayerRegistred(activeChar.getObjectId())) { status = ClanEntryStatus.WAITING; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java index 161a4f94f7..872bcb43b3 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingApply.java @@ -64,7 +64,7 @@ public class RequestPledgeWaitingApply extends L2GameClientPacket return; } - if (ClanEntryManager.getInstance().addPlayerApplicationToClan(_clanId, (new PledgeApplicantInfo(activeChar.getObjectId(), activeChar.getName(), activeChar.getLevel(), _karma, _clanId, _message)))) + if (ClanEntryManager.getInstance().addPlayerApplicationToClan(_clanId, new PledgeApplicantInfo(activeChar.getObjectId(), activeChar.getName(), activeChar.getLevel(), _karma, _clanId, _message))) { activeChar.sendPacket(new ExPledgeRecruitApplyInfo(ClanEntryStatus.WAITING)); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java index 4bce65e208..07b04eed1e 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeWaitingUser.java @@ -51,13 +51,13 @@ public class RequestPledgeWaitingUser extends L2GameClientPacket final PledgeApplicantInfo infos = ClanEntryManager.getInstance().getPlayerApplication(_clanId, _playerId); - if (infos == null) + if (infos != null) { - activeChar.sendPacket(new ExPledgeWaitingList(_clanId)); + activeChar.sendPacket(new ExPledgeWaitingUser(infos)); } else { - activeChar.sendPacket(new ExPledgeWaitingUser(infos)); + activeChar.sendPacket(new ExPledgeWaitingList(_clanId)); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java index cfe5913b6f..5bc8fdcbde 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestPrivateStoreBuy.java @@ -111,7 +111,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket return; } - if (!((storePlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL))) + if ((storePlayer.getPrivateStoreType() != PrivateStoreType.SELL) && (storePlayer.getPrivateStoreType() != PrivateStoreType.PACKAGE_SELL)) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java index 99ebd69696..a7b30318a0 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestProcureCropList.java @@ -119,7 +119,7 @@ public class RequestProcureCropList extends L2GameClientPacket } final L2Item template = ItemTable.getInstance().getTemplate(i.getRewardId()); - weight += (i.getCount() * template.getWeight()); + weight += i.getCount() * template.getWeight(); if (!template.isStackable()) { @@ -166,7 +166,7 @@ public class RequestProcureCropList extends L2GameClientPacket } // Fee for selling to other manors - final long fee = (castleId == i.getManorId()) ? 0 : ((long) (i.getPrice() * 0.05)); + final long fee = (castleId == i.getManorId()) ? 0 : (long) (i.getPrice() * 0.05); if ((fee != 0) && (player.getAdena() < fee)) { SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_IN_TRADING_S2_OF_S1_CROPS); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java index 8e17a8bbfa..c634f080fe 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestQuestAbort.java @@ -57,20 +57,14 @@ public final class RequestQuestAbort extends L2GameClientPacket qs.exitQuest(true); activeChar.sendPacket(new QuestList()); } - else + else if (Config.DEBUG) { - if (Config.DEBUG) - { - _log.info("Player '" + activeChar.getName() + "' try to abort quest " + qe.getName() + " but he didn't have it started."); - } + _log.info("Player '" + activeChar.getName() + "' try to abort quest " + qe.getName() + " but he didn't have it started."); } } - else + else if (Config.DEBUG) { - if (Config.DEBUG) - { - _log.warning("Quest (id='" + _questId + "') not found."); - } + _log.warning("Quest (id='" + _questId + "') not found."); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java index 165b711823..de80afd674 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeBookOpen.java @@ -30,7 +30,7 @@ public final class RequestRecipeBookOpen extends L2GameClientPacket @Override protected void readImpl() { - _isDwarvenCraft = (readD() == 0); + _isDwarvenCraft = readD() == 0; if (Config.DEBUG) { _log.info("RequestRecipeBookOpen : " + (_isDwarvenCraft ? "dwarvenCraft" : "commonCraft")); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java index 51eab0ddb0..4d477b3585 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java @@ -40,7 +40,7 @@ public final class RequestRecipeItemMakeInfo extends L2GameClientPacket return; } - sendPacket((new RecipeItemMakeInfo(_id, player))); + sendPacket(new RecipeItemMakeInfo(_id, player)); } @Override diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java index 8aa27900bc..85d840ab82 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java @@ -38,7 +38,7 @@ public final class RequestRecipeShopManagePrev extends L2GameClientPacket protected void runImpl() { final L2PcInstance player = getActiveChar(); - if ((player == null)) + if (player == null) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java index df71d94f5e..c5a844f1c4 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRecordInfo.java @@ -49,15 +49,12 @@ public class RequestRecordInfo extends L2GameClientPacket { activeChar.sendPacket(new SpawnItem(object)); } - else + else if (!object.isVisibleFor(activeChar)) { - if (!object.isVisibleFor(activeChar)) + object.sendInfo(activeChar); + if ((object instanceof L2Character) && (((L2Character) object).getAI() != null)) { - object.sendInfo(activeChar); - if ((object instanceof L2Character) && (((L2Character) object).getAI() != null)) - { - ((L2Character) object).getAI().describeStateToPlayer(activeChar); - } + ((L2Character) object).getAI().describeStateToPlayer(activeChar); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index b7f0bbeb46..a33ab76306 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -87,7 +87,7 @@ public final class RequestRefundItem extends L2GameClientPacket L2Character merchant = null; if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { - if (!(target instanceof L2MerchantInstance) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) + if (!(target instanceof L2MerchantInstance) || !player.isInsideRadius(target, INTERACTION_DISTANCE, true, false) || (player.getInstanceId() != target.getInstanceId())) { sendPacket(ActionFailed.STATIC_PACKET); return; diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java index 41205d154e..7d7fd70bc9 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRegistBeauty.java @@ -100,7 +100,7 @@ public class RequestRegistBeauty extends L2GameClientPacket requiredBeautyShopTicket += face.getBeautyShopTicket(); } - if ((player.getAdena() < requiredAdena) || ((player.getBeautyTickets() < requiredBeautyShopTicket))) + if ((player.getAdena() < requiredAdena) || (player.getBeautyTickets() < requiredBeautyShopTicket)) { player.sendPacket(new ExResponseBeautyRegistReset(player, ExResponseBeautyRegistReset.CHANGE, ExResponseBeautyRegistReset.FAILURE)); player.sendPacket(new ExResponseBeautyList(player, ExResponseBeautyList.SHOW_FACESHAPE)); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index a83d90fe26..14dc080e71 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -75,7 +75,7 @@ public final class RequestRestart extends L2GameClientPacket return; } - if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && Config.GM_RESTART_FIGHTING)) + if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && (!player.isGM() || !Config.GM_RESTART_FIGHTING)) { if (Config.DEBUG) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java index fbe0d6f917..35f54deef6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestRestartPoint.java @@ -198,7 +198,7 @@ public final class RequestRestartPoint extends L2GameClientPacket { siegeClan = hall.getSiege().getAttackerClan(activeChar.getClan()); } - if (((siegeClan == null) || siegeClan.getFlag().isEmpty())) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) { // Check if clan hall has inner spawns loc if (hall != null) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 5ad9b7f487..0ebc211448 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -112,7 +112,7 @@ public final class RequestSellItem extends L2GameClientPacket L2Character merchant = null; if (!player.isGM() && (_listId != CUSTOM_CB_SELL_LIST)) { - if ((target == null) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) + if ((target == null) || !player.isInsideRadius(target, INTERACTION_DISTANCE, true, false) || (player.getInstanceId() != target.getInstanceId())) { sendPacket(ActionFailed.STATIC_PACKET); return; @@ -152,7 +152,7 @@ public final class RequestSellItem extends L2GameClientPacket for (UniqueItemHolder i : _items) { L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "sell"); - if ((item == null) || (!item.isSellable())) + if ((item == null) || !item.isSellable()) { continue; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java index 1c8cb74edb..e637ea1d3c 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestSetPledgeCrest.java @@ -56,7 +56,7 @@ public final class RequestSetPledgeCrest extends L2GameClientPacket return; } - if ((_length < 0)) + if (_length < 0) { activeChar.sendPacket(SystemMessageId.THE_SIZE_OF_THE_UPLOADED_SYMBOL_DOES_NOT_MEET_THE_STANDARD_REQUIREMENTS); return; diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java index de7853401f..3ca4c3c25d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestVoteNew.java @@ -48,13 +48,13 @@ public final class RequestVoteNew extends L2GameClientPacket if (!(object instanceof L2PcInstance)) { - if (object == null) + if (object != null) { - activeChar.sendPacket(SystemMessageId.SELECT_TARGET); + activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); } else { - activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET); + activeChar.sendPacket(SystemMessageId.SELECT_TARGET); } return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java index 2645e7efe4..9ce6864652 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java @@ -73,7 +73,7 @@ public final class RequestWithDrawPremiumItem extends L2GameClientPacket return; } - final long itemsLeft = (_item.getCount() - _itemCount); + final long itemsLeft = _item.getCount() - _itemCount; activeChar.addItem("PremiumItem", _item.getItemId(), _itemCount, activeChar.getTarget(), true); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java index e574b70e7b..04efceb876 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java @@ -56,7 +56,7 @@ public final class RequestWithdrawPartyRoom extends L2GameClientPacket return; } - if ((_activeChar.isInParty() && _room.getOwner().isInParty()) && (_activeChar.getParty().getLeaderObjectId() == _room.getOwner().getParty().getLeaderObjectId())) + if (_activeChar.isInParty() && _room.getOwner().isInParty() && (_activeChar.getParty().getLeaderObjectId() == _room.getOwner().getParty().getLeaderObjectId())) { // If user is in party with Room Owner // is not removed from Room diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java index 38a1473aed..5c386fccfe 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -154,12 +154,9 @@ public final class Say2 extends L2GameClientPacket { activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_SO_CHATTING_IS_NOT_ALLOWED); } - else + else if (Config.BAN_CHAT_CHANNELS.contains(chatType)) { - if (Config.BAN_CHAT_CHANNELS.contains(chatType)) - { - activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER); - } + activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER); } return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java index 1429937c15..06b2e9645c 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendBypassBuildCmd.java @@ -79,7 +79,7 @@ public final class SendBypassBuildCmd extends L2GameClientPacket if (Config.GMAUDIT) { - GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target")); + GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"); } ach.useAdminCommand("admin_" + _command, activeChar); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 0904d371bd..3e98d9d437 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -117,13 +117,10 @@ public final class SendWareHouseWithDrawList extends L2GameClientPacket return; } } - else + else if ((warehouse instanceof ClanWarehouse) && !player.isClanLeader()) { - if ((warehouse instanceof ClanWarehouse) && !player.isClanLeader()) - { - player.sendPacket(SystemMessageId.ITEMS_LEFT_AT_THE_CLAN_HALL_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_DO_YOU_WANT_TO_CONTINUE); - return; - } + player.sendPacket(SystemMessageId.ITEMS_LEFT_AT_THE_CLAN_HALL_WAREHOUSE_CAN_ONLY_BE_RETRIEVED_BY_THE_CLAN_LEADER_DO_YOU_WANT_TO_CONTINUE); + return; } int weight = 0; diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java index e9cbbe5a04..e8d5538e73 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/SetPrivateStoreListSell.java @@ -47,7 +47,7 @@ public class SetPrivateStoreListSell extends L2GameClientPacket @Override protected void readImpl() { - _packageSale = (readD() == 1); + _packageSale = readD() == 1; final int count = readD(); if ((count < 1) || (count > Config.MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java index 107bacb6f0..077edfec69 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/TradeDone.java @@ -75,7 +75,7 @@ public final class TradeDone extends L2GameClientPacket return; } - if ((trade.getOwner().hasItemRequest()) || (trade.getPartner().hasItemRequest())) + if (trade.getOwner().hasItemRequest() || trade.getPartner().hasItemRequest()) { return; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java index 52218a10e6..82cd3be6bc 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -251,7 +251,7 @@ public final class UseItem extends L2GameClientPacket case L2Item.SLOT_FULL_ARMOR: case L2Item.SLOT_LEGS: { - if ((activeChar.getRace() == Race.ERTHEIA) && (activeChar.isMageClass()) && ((item.getItem().getItemType() == ArmorType.SHIELD) || (item.getItem().getItemType() == ArmorType.SIGIL))) + if ((activeChar.getRace() == Race.ERTHEIA) && activeChar.isMageClass() && ((item.getItem().getItemType() == ArmorType.SHIELD) || (item.getItem().getItemType() == ArmorType.SIGIL))) { activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; @@ -296,7 +296,7 @@ public final class UseItem extends L2GameClientPacket else { final L2Weapon weaponItem = activeChar.getActiveWeaponItem(); - if (((weaponItem != null) && (weaponItem.getItemType() == WeaponType.FISHINGROD)) && (((_itemId >= 6519) && (_itemId <= 6527)) || ((_itemId >= 7610) && (_itemId <= 7613)) || ((_itemId >= 7807) && (_itemId <= 7809)) || ((_itemId >= 8484) && (_itemId <= 8486)) || ((_itemId >= 8505) && (_itemId <= 8513)))) + if ((weaponItem != null) && (weaponItem.getItemType() == WeaponType.FISHINGROD) && (((_itemId >= 6519) && (_itemId <= 6527)) || ((_itemId >= 7610) && (_itemId <= 7613)) || ((_itemId >= 7807) && (_itemId <= 7809)) || ((_itemId >= 8484) && (_itemId <= 8486)) || ((_itemId >= 8505) && (_itemId <= 8513)))) { activeChar.getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, item); activeChar.broadcastUserInfo(); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java index d43acccb3a..b659564a9d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ValidatePosition.java @@ -81,7 +81,7 @@ public class ValidatePosition extends L2GameClientPacket dx = _x - activeChar.getInVehiclePosition().getX(); dy = _y - activeChar.getInVehiclePosition().getY(); // dz = _z - activeChar.getInVehiclePosition().getZ(); - diffSq = ((dx * dx) + (dy * dy)); + diffSq = (dx * dx) + (dy * dy); if (diffSq > 250000) { sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInVehiclePosition())); @@ -98,7 +98,7 @@ public class ValidatePosition extends L2GameClientPacket dx = _x - realX; dy = _y - realY; dz = _z - realZ; - diffSq = ((dx * dx) + (dy * dy)); + diffSq = (dx * dx) + (dy * dy); // Zoey76: TODO: Implement or cleanup. // L2Party party = activeChar.getParty(); diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java index 833d1697ea..3633ebea85 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/adenadistribution/RequestDivideAdena.java @@ -125,7 +125,7 @@ public class RequestDivideAdena extends L2GameClientPacket { for (L2PcInstance target : targets) { - if ((target == null)) + if (target == null) { // TODO : handle that case here + regive adena OR filter with Objects::nonNull on memberCount ? // those sys msg exists and bother me ADENA_WAS_NOT_DISTRIBUTED_TO_S1 / YOU_DID_NOT_RECEIVE_ADENA_DISTRIBUTION diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java index a7e196d5e8..1626e0ed88 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/alchemy/RequestAlchemyTryMixCube.java @@ -28,8 +28,8 @@ import com.l2jmobius.gameserver.network.serverpackets.alchemy.ExTryMixCube; public class RequestAlchemyTryMixCube extends L2GameClientPacket { - private final static int AIR_STONE = 39461; - private final static int ELCYUM_CRYSTAL = 36514; + private static final int AIR_STONE = 39461; + private static final int ELCYUM_CRYSTAL = 36514; private final Map _items = new HashMap<>(); public RequestAlchemyTryMixCube() diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 6f04b996cf..832e2f8b44 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -262,24 +262,24 @@ public class RequestShapeShiftingItem extends L2GameClientPacket final InventoryUpdate iu = new InventoryUpdate(); iu.addModifiedItem(targetItem); - if (inventory.getItemByObjectId(stone.getObjectId()) == null) + if (inventory.getItemByObjectId(stone.getObjectId()) != null) { - iu.addRemovedItem(stone); + iu.addModifiedItem(stone); } else { - iu.addModifiedItem(stone); + iu.addRemovedItem(stone); } if (appearanceStone.getType() == AppearanceType.NORMAL) { - if (inventory.getItemByObjectId(extracItem.getObjectId()) == null) + if (inventory.getItemByObjectId(extracItem.getObjectId()) != null) { - iu.addRemovedItem(extracItem); + iu.addModifiedItem(extracItem); } else { - iu.addModifiedItem(extracItem); + iu.addRemovedItem(extracItem); } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 285c62bf29..4db46dba09 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -132,7 +132,7 @@ public class RequestItemEnsoul extends L2GameClientPacket activeChar.sendPacket(new ExUserInfoInvenWeight(activeChar)); } - private static final boolean checkAndConsume(L2PcInstance activeChar, L2ItemInstance soulcrystal, L2ItemInstance targetItem, boolean changing, boolean special) + private static boolean checkAndConsume(L2PcInstance activeChar, L2ItemInstance soulcrystal, L2ItemInstance targetItem, boolean changing, boolean special) { final CrystalType targetItemGrade = targetItem.getItem().getCrystalType(); final int gemstoneId = getGemStoneId(targetItemGrade); @@ -166,7 +166,7 @@ public class RequestItemEnsoul extends L2GameClientPacket return true; } - private static final long getGemstoneCount(CrystalType itemGrade, boolean price2x, boolean changing, boolean special) + private static long getGemstoneCount(CrystalType itemGrade, boolean price2x, boolean changing, boolean special) { switch (itemGrade) { @@ -210,7 +210,7 @@ public class RequestItemEnsoul extends L2GameClientPacket } } - private static final int getGemStoneId(CrystalType itemGrade) + private static int getGemStoneId(CrystalType itemGrade) { switch (itemGrade) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 5bef502be5..15b3096b79 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,32 +69,29 @@ public class ConfirmMenteeAdd extends L2GameClientPacket mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); } - else + else if (validate(mentor, mentee)) { - if (validate(mentor, mentee)) + try (Connection con = DatabaseFactory.getInstance().getConnection(); + PreparedStatement statement = con.prepareStatement("INSERT INTO character_mentees (charId, mentorId) VALUES (?, ?)")) { - try (Connection con = DatabaseFactory.getInstance().getConnection(); - PreparedStatement statement = con.prepareStatement("INSERT INTO character_mentees (charId, mentorId) VALUES (?, ?)")) - { - statement.setInt(1, mentee.getObjectId()); - statement.setInt(2, mentor.getObjectId()); - statement.execute(); - - MentorManager.getInstance().addMentor(mentor.getObjectId(), mentee.getObjectId()); - - // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); - mentor.sendPacket(new ExMentorList(mentor)); - - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); - mentee.sendPacket(new ExMentorList(mentee)); - } - catch (Exception e) - { - _log.log(Level.WARNING, e.getMessage(), e); - } + statement.setInt(1, mentee.getObjectId()); + statement.setInt(2, mentor.getObjectId()); + statement.execute(); + + MentorManager.getInstance().addMentor(mentor.getObjectId(), mentee.getObjectId()); + + // Notify to scripts + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); + + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(new ExMentorList(mentor)); + + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(new ExMentorList(mentee)); + } + catch (Exception e) + { + _log.log(Level.WARNING, e.getMessage(), e); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java index fb0d3c353e..8db92b0c01 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/primeshop/RequestBRBuyProduct.java @@ -68,7 +68,7 @@ public final class RequestBRBuyProduct extends L2GameClientPacket final PrimeShopGroup item = PrimeShopData.getInstance().getItem(_brId); if (validatePlayer(item, _count, activeChar)) { - final int price = (item.getPrice() * _count); + final int price = item.getPrice() * _count; final int paymentId = validatePaymentId(activeChar, item, price); if (paymentId < 0) diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java index 6e044810ea..d3b66110d6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java +++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/shuttle/RequestShuttleGetOn.java @@ -53,7 +53,7 @@ public class RequestShuttleGetOn extends L2GameClientPacket // TODO: better way? for (L2Object obj : activeChar.getKnownList().getKnownObjects().values()) { - if ((obj instanceof L2ShuttleInstance)) + if (obj instanceof L2ShuttleInstance) { final L2ShuttleInstance shuttle = (L2ShuttleInstance) obj; if (shuttle.calculateDistance(activeChar, false, false) < 1000) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java index d4e27aee86..9922832bc1 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/AbstractItemPacket.java @@ -125,7 +125,7 @@ public abstract class AbstractItemPacket extends AbstractMaskPacket 0) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 3e841ecae5..28690fad2f 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -61,7 +61,7 @@ public class CharSelectionInfo extends L2GameServerPacket protected final void writeImpl() { writeC(0x09); // packet id - final int size = (_characterPackages.size()); + final int size = _characterPackages.size(); writeD(size); // How many char there is on this account // Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) ) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java index 2386546d33..5874d5dd0d 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java @@ -107,20 +107,17 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket { bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V2; - } - else - { - bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V3; - } + bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK_V3; } reqCount = 1; break; @@ -131,20 +128,17 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket { bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V2; - } - else - { - bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V3; - } + bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK_V3; } reqCount = 1; break; @@ -155,20 +149,17 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket { bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_OLD; } + else if (_elvl == 0) + { + bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK; + } + else if (_elvl == 1) + { + bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V2; + } else { - if (_elvl == 0) - { - bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK; - } - else if (_elvl == 1) - { - bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V2; - } - else - { - bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V3; - } + bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK_V3; } reqCount = 1; break; @@ -179,20 +170,17 @@ public class ExEnchantSkillInfoDetail extends L2GameServerPacket { bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL; } + else if (_elvl == 0) + { + bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL; + } + else if (_elvl == 1) + { + bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V2; + } else { - if (_elvl == 0) - { - bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL; - } - else if (_elvl == 1) - { - bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V2; - } - else - { - bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V3; - } + bookId = EnchantSkillGroupsData.IMMORTAL_SCROLL_V3; } reqCount = 1; break; diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java index 6abdab0b5d..cf26f589c6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java @@ -24,7 +24,7 @@ public class ExEnchantSkillResult extends L2GameServerPacket private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true); private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false); - public static final ExEnchantSkillResult valueOf(boolean result) + public static ExEnchantSkillResult valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java index e29dbefcb0..770f100251 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExMagicAttackInfo.java @@ -21,13 +21,13 @@ package com.l2jmobius.gameserver.network.serverpackets; */ public class ExMagicAttackInfo extends L2GameServerPacket { - public final static int CRITICAL = 1; - public final static int CRITICAL_HEAL = 2; - public final static int OVERHIT = 3; - public final static int EVADED = 4; - public final static int BLOCKED = 5; - public final static int RESISTED = 6; - public final static int IMMUNE = 7; + public static final int CRITICAL = 1; + public static final int CRITICAL_HEAL = 2; + public static final int OVERHIT = 3; + public static final int EVADED = 4; + public static final int BLOCKED = 5; + public static final int RESISTED = 6; + public static final int IMMUNE = 7; private final int _caster; private final int _target; diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java index a9bd5584cc..02109ed4cc 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExManagePartyRoomMember.java @@ -56,16 +56,13 @@ public class ExManagePartyRoomMember extends L2GameServerPacket { writeD(1); } + else if (_room.getOwner().isInParty() && _activeChar.isInParty() && (_room.getOwner().getParty().getLeaderObjectId() == _activeChar.getParty().getLeaderObjectId())) + { + writeD(0x02); + } else { - if ((_room.getOwner().isInParty() && _activeChar.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _activeChar.getParty().getLeaderObjectId())) - { - writeD(0x02); - } - else - { - writeD(0x00); - } + writeD(0x00); } writeD(0x00); // TODO: instance reuse time size // TODO: for size writeD(instanceId) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java index 0082449c42..10d9fe1890 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java @@ -24,7 +24,7 @@ public class ExNoticePostArrived extends L2GameServerPacket private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true); private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false); - public static final ExNoticePostArrived valueOf(boolean result) + public static ExNoticePostArrived valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java index f7bcf2d7b3..b7d2c1643e 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java @@ -24,7 +24,7 @@ public class ExNoticePostSent extends L2GameServerPacket private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true); private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false); - public static final ExNoticePostSent valueOf(boolean result) + public static ExNoticePostSent valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java index d7b99ed89c..93696bf5ef 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPartyRoomMember.java @@ -51,16 +51,13 @@ public class ExPartyRoomMember extends L2GameServerPacket { writeD(0x01); } + else if (_room.getOwner().isInParty() && member.isInParty() && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) + { + writeD(0x02); + } else { - if ((_room.getOwner().isInParty() && member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) - { - writeD(0x02); - } - else - { - writeD(0x00); - } + writeD(0x00); } writeD(0x00); // TODO: Instance datas there is more if that is not 0! } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index 890fa0df22..3cf24c4310 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -27,13 +27,13 @@ import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; public class ExPledgeRecruitBoardSearch extends L2GameServerPacket { final List _clanList; - final private int _currentPage; - final private int _totalNumberOfPage; - final private int _clanOnCurrentPage; - final private int _startIndex; - final private int _endIndex; + private final int _currentPage; + private final int _totalNumberOfPage; + private final int _clanOnCurrentPage; + private final int _startIndex; + private final int _endIndex; - final static int CLAN_PER_PAGE = 12; + static final int CLAN_PER_PAGE = 12; public ExPledgeRecruitBoardSearch(List clanList, int currentPage) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java index dbcc1fb95a..18ad28fe71 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java @@ -31,7 +31,7 @@ public class ExPutItemResultForVariationCancel extends L2GameServerPacket _itemObjId = item.getObjectId(); _itemId = item.getDisplayId(); _price = price; - _itemAug1 = ((short) item.getAugmentation().getAugmentationId()); + _itemAug1 = (short) item.getAugmentation().getAugmentationId(); _itemAug2 = item.getAugmentation().getAugmentationId() >> 16; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java index eee770f40a..9ee9d85dbd 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyList.java @@ -31,8 +31,8 @@ public class ExResponseBeautyList extends L2GameServerPacket private final int _type; private final Map _beautyItem; - public final static int SHOW_FACESHAPE = 1; - public final static int SHOW_HAIRSTYLE = 0; + public static final int SHOW_FACESHAPE = 1; + public static final int SHOW_HAIRSTYLE = 0; public ExResponseBeautyList(L2PcInstance activeChar, int type) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java index 0536127a11..82c19e7e32 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExResponseBeautyRegistReset.java @@ -27,11 +27,11 @@ public class ExResponseBeautyRegistReset extends L2GameServerPacket private final int _type; private final int _result; - public final static int FAILURE = 0; - public final static int SUCCESS = 1; + public static final int FAILURE = 0; + public static final int SUCCESS = 1; - public final static int CHANGE = 0; - public final static int RESTORE = 1; + public static final int CHANGE = 0; + public static final int RESTORE = 1; public ExResponseBeautyRegistReset(L2PcInstance activeChar, int type, int result) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java index 7c703127b8..03fdbced3b 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowBeautyMenu.java @@ -26,8 +26,8 @@ public class ExShowBeautyMenu extends L2GameServerPacket private final L2PcInstance _activeChar; private final int _type; - public final static int MODIFY_APPEARANCE = 0; - public final static int RESTORE_APPEARANCE = 1; + public static final int MODIFY_APPEARANCE = 0; + public static final int RESTORE_APPEARANCE = 1; public ExShowBeautyMenu(L2PcInstance activeChar, int type) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java index 3fc30e72a8..bb4c026646 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java @@ -40,7 +40,7 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket _fortId = fort.getResidenceId(); _size = fort.getFortSize(); final List commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId); - _csize = ((commanders == null) ? 0 : commanders.size()); + _csize = (commanders == null) ? 0 : commanders.size(); _csize2 = fort.getSiege().getCommanders().size(); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java index c2bb0edc79..2f4be290d6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java @@ -220,15 +220,12 @@ public class ExShowScreenMessage extends L2GameServerPacket writeS(_text); exsize--; } - else + else if (_parameters != null) { - if (_parameters != null) + for (String s : _parameters) { - for (String s : _parameters) - { - writeS(s); - exsize--; - } + writeS(s); + exsize--; } } for (int i = 1; i < exsize; i++) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java index 3466a17dea..2192cdafd6 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/HennaEquipList.java @@ -54,7 +54,7 @@ public class HennaEquipList extends L2GameServerPacket { // Player must have at least one dye in inventory // to be able to see the Henna that can be applied with it. - if ((_player.getInventory().getItemByItemId(henna.getDyeItemId())) != null) + if (_player.getInventory().getItemByItemId(henna.getDyeItemId()) != null) { writeD(henna.getDyeId()); // dye Id writeD(henna.getDyeItemId()); // item Id of the dye diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java index 31a19a76e2..c8a51c14fe 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java @@ -47,7 +47,7 @@ public class PledgeReceiveMemberInfo extends L2GameServerPacket // clan or subpledge name if (_member.getPledgeType() != 0) { - writeS((_member.getClan().getSubPledge(_member.getPledgeType())).getName()); + writeS(_member.getClan().getSubPledge(_member.getPledgeType()).getName()); } else { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java index 5b0251c5f0..c6b140c0ed 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java @@ -32,7 +32,7 @@ public final class PledgeShowMemberListAdd extends L2GameServerPacket _name = player.getName(); _lvl = player.getLevel(); _classId = player.getClassId().getId(); - _isOnline = (player.isOnline() ? player.getObjectId() : 0); + _isOnline = player.isOnline() ? player.getObjectId() : 0; _pledgeType = player.getPledgeType(); } @@ -41,7 +41,7 @@ public final class PledgeShowMemberListAdd extends L2GameServerPacket _name = cm.getName(); _lvl = cm.getLevel(); _classId = cm.getClassId(); - _isOnline = (cm.isOnline() ? cm.getObjectId() : 0); + _isOnline = cm.isOnline() ? cm.getObjectId() : 0; _pledgeType = cm.getPledgeType(); } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 6dfcf62024..c210527a92 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -66,7 +66,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket private void writePledge(SubPledge pledge, String name, String ldname) { - _pledgeType = (pledge == null ? 0x00 : pledge.getId()); + _pledgeType = pledge == null ? 0x00 : pledge.getId(); writeC(0x5a); String _name = ""; @@ -74,7 +74,7 @@ public class PledgeShowMemberListAll extends L2GameServerPacket { _name = subPledge.getName(); } - writeD((_name.equals("")) || (_name.equals(name)) ? 0 : 1); + writeD(_name.equals("") || _name.equals(name) ? 0 : 1); writeD(_clan.getId()); writeD(Config.SERVER_ID); writeD(_pledgeType); diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java index 23bd2ba5ec..fe8af498a5 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java @@ -21,7 +21,7 @@ public final class RestartResponse extends L2GameServerPacket private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true); private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false); - public static final RestartResponse valueOf(boolean result) + public static RestartResponse valueOf(boolean result) { return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE; } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java index 884e848a6d..d6b4089759 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/ShopPreviewInfo.java @@ -78,6 +78,6 @@ public class ShopPreviewInfo extends L2GameServerPacket private int getFromList(int key) { - return (_itemlist.containsKey(key) ? _itemlist.get(key) : 0); + return _itemlist.containsKey(key) ? _itemlist.get(key) : 0; } } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java index 03f14df9c6..cbd7fe8edd 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SiegeInfo.java @@ -73,7 +73,7 @@ public class SiegeInfo extends L2GameServerPacket final int ownerId = _castle.getOwnerId(); - writeD(((ownerId == activeChar.getClanId()) && (activeChar.isClanLeader())) ? 0x01 : 0x00); + writeD(((ownerId == activeChar.getClanId()) && activeChar.isClanLeader()) ? 0x01 : 0x00); writeD(ownerId); if (ownerId > 0) { @@ -126,7 +126,7 @@ public class SiegeInfo extends L2GameServerPacket final int ownerId = _hall.getOwnerId(); - writeD(((ownerId == activeChar.getClanId()) && (activeChar.isClanLeader())) ? 0x01 : 0x00); + writeD(((ownerId == activeChar.getClanId()) && activeChar.isClanLeader()) ? 0x01 : 0x00); writeD(ownerId); if (ownerId > 0) { @@ -152,7 +152,7 @@ public class SiegeInfo extends L2GameServerPacket } writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000)); - writeD((int) ((CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000)); + writeD((int) (CHSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime() / 1000)); writeD(0x00); // number of choices? } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java index fe1b5984e6..ee404ef0f8 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java @@ -297,15 +297,15 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { if ((o1.getType2() == L2Item.TYPE2_MONEY) && (o2.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } if ((o2.getType2() == L2Item.TYPE2_MONEY) && (o1.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } final String s1 = o1.getItemName(); final String s2 = o2.getItemName(); - return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); + return order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1); } } @@ -329,13 +329,13 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { if ((o1.getType2() == L2Item.TYPE2_MONEY) && (o2.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } if ((o2.getType2() == L2Item.TYPE2_MONEY) && (o1.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } - if ((o1.isEtcItem() && (o1.getItemType() == EtcItemType.RECIPE)) && (o2.isEtcItem() && (o2.getItemType() == EtcItemType.RECIPE))) + if (o1.isEtcItem() && (o1.getItemType() == EtcItemType.RECIPE) && o2.isEtcItem() && (o2.getItemType() == EtcItemType.RECIPE)) { try { @@ -344,17 +344,17 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket if (rp1 == null) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } if (rp2 == null) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } final Integer i1 = rp1.getLevel(); final Integer i2 = rp2.getLevel(); - return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); + return order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1); } catch (Exception e) { @@ -364,7 +364,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket final String s1 = o1.getItemName(); final String s2 = o2.getItemName(); - return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1)); + return order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1); } } @@ -385,15 +385,15 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { if ((o1.getType2() == L2Item.TYPE2_MONEY) && (o2.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } if ((o2.getType2() == L2Item.TYPE2_MONEY) && (o1.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } final Integer i1 = o1.getBodyPart(); final Integer i2 = o2.getBodyPart(); - return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); + return order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1); } } @@ -414,15 +414,15 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { if ((o1.getType2() == L2Item.TYPE2_MONEY) && (o2.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } if ((o2.getType2() == L2Item.TYPE2_MONEY) && (o1.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } final CrystalType i1 = o1.getItemGrade(); final CrystalType i2 = o2.getItemGrade(); - return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); + return order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1); } } @@ -443,17 +443,17 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket { if ((o1.getType2() == L2Item.TYPE2_MONEY) && (o2.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? Z2A : A2Z); + return order == A2Z ? Z2A : A2Z; } if ((o2.getType2() == L2Item.TYPE2_MONEY) && (o1.getType2() != L2Item.TYPE2_MONEY)) { - return (order == A2Z ? A2Z : Z2A); + return order == A2Z ? A2Z : Z2A; } try { final MaterialType i1 = o1.getItem().getMaterialType(); final MaterialType i2 = o2.getItem().getMaterialType(); - return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1)); + return order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1); } catch (Exception e) { @@ -595,7 +595,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { - if ((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) + if ((item.isEtcItem() && item.getItemName().toUpperCase().startsWith("AMULET")) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) { if (list.size() >= MAX_SORT_LIST_ITEMS) { @@ -619,7 +619,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { - if ((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) + if ((item.isEtcItem() && !item.getItemName().toUpperCase().startsWith("AMULET")) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) { if (list.size() >= MAX_SORT_LIST_ITEMS) { @@ -739,7 +739,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket final List list = new ArrayList<>(); for (L2ItemInstance item : _items) { - if ((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) + if ((item.isEtcItem() && (item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY)) { if (list.size() >= MAX_SORT_LIST_ITEMS) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index c0ed250559..94f118cc5f 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -28,7 +28,7 @@ public final class SystemMessage extends AbstractMessagePacket super(smId); } - public static final SystemMessage sendString(String text) + public static SystemMessage sendString(String text) { if (text == null) { @@ -40,7 +40,7 @@ public final class SystemMessage extends AbstractMessagePacket return sm; } - public static final SystemMessage getSystemMessage(SystemMessageId smId) + public static SystemMessage getSystemMessage(SystemMessageId smId) { SystemMessage sm = smId.getStaticSystemMessage(); if (sm != null) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java index bf8ae55b20..905d2164df 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -33,7 +33,7 @@ public final class TradeStart extends AbstractItemPacket { _activeChar = player; _partner = player.getActiveTradeList().getPartner(); - _itemList = _activeChar.getInventory().getAvailableItems(true, (_activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && Config.GM_TRADE_RESTRICTED_ITEMS), false); + _itemList = _activeChar.getInventory().getAvailableItems(true, _activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && Config.GM_TRADE_RESTRICTED_ITEMS, false); if (_partner == null) { diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemySkillList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemySkillList.java index 1f54c54618..f48475f632 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemySkillList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/alchemy/ExAlchemySkillList.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.L2GameServerPacket; */ public class ExAlchemySkillList extends L2GameServerPacket { - private final static int ALCHEMY_CUBE_SKILL = 17943; + private static final int ALCHEMY_CUBE_SKILL = 17943; private final List _skills = new ArrayList<>(); public ExAlchemySkillList(L2PcInstance player) diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index fb4864a3bc..4565d0d171 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -65,7 +65,6 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeC(createDate.get(Calendar.MONTH) + 1); writeC(createDate.get(Calendar.DAY_OF_MONTH)); writeD((int) ((System.currentTimeMillis() - friend.getLastLogin()) / 1000)); - writeS(friend.getMemo()); // memo } else { @@ -84,7 +83,7 @@ public class ExFriendDetailInfo extends L2GameServerPacket writeC(createDate.get(Calendar.MONTH) + 1); writeC(createDate.get(Calendar.DAY_OF_MONTH)); writeD(player.isOnline() ? -1 : (int) ((System.currentTimeMillis() - player.getLastAccess()) / 1000)); - writeS(friend.getMemo()); // memo } + writeS(friend.getMemo()); // memo } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java index b4d30c0058..a693381612 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/friend/FriendList.java @@ -50,7 +50,6 @@ public class FriendList extends L2GameServerPacket writeD(player.getObjectId()); writeD(player.getLevel()); writeD(player.getClassId().getId()); - writeS("testing"); } else { @@ -60,8 +59,8 @@ public class FriendList extends L2GameServerPacket writeD(0x00); writeD(friend.getLevel()); writeD(friend.getClassId()); - writeS("testing"); } + writeS("testing"); } } } diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java index b720fef623..ddf5742267 100644 --- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java +++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/luckygame/ExBettingLuckyGameResult.java @@ -78,7 +78,7 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket } // Check inventory capacity - if ((rewards.size() > 0) && ((!_activeChar.getInventory().validateCapacity(rewards.size())) || (!_activeChar.getInventory().validateWeight(totalWeight)))) + if ((rewards.size() > 0) && (!_activeChar.getInventory().validateCapacity(rewards.size()) || !_activeChar.getInventory().validateWeight(totalWeight))) { _activeChar.sendPacket(new ExStartLuckyGame(_type)); _activeChar.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_EITHER_FULL_OR_OVERWEIGHT); @@ -109,25 +109,21 @@ public class ExBettingLuckyGameResult extends L2GameServerPacket writeD(0x02); // normal = 1, rare = 2 (forcing 2) writeD(reward.getId()); writeD((int) reward.getCount()); - + final SystemMessage sm; if (_type == 2) { _activeChar.addItem("LuxuryFortuneTelling", reward, _activeChar, false); - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_IN_THE_LUXURY_FORTUNE_READING); - sm.addPcName(_activeChar); - sm.addLong(reward.getCount()); - sm.addItemName(new L2ItemInstance(reward.getId())); - _activeChar.broadcastPacket(sm, 1000); + sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_IN_THE_LUXURY_FORTUNE_READING); } else { _activeChar.addItem("FortuneTelling", reward, _activeChar, false); - final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING); - sm.addPcName(_activeChar); - sm.addLong(reward.getCount()); - sm.addItemName(new L2ItemInstance(reward.getId())); - _activeChar.broadcastPacket(sm, 1000); + sm = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_HAS_OBTAINED_S2_OF_S3_THROUGH_FORTUNE_READING); } + sm.addPcName(_activeChar); + sm.addLong(reward.getCount()); + sm.addItemName(new L2ItemInstance(reward.getId())); + _activeChar.broadcastPacket(sm, 1000); } } else diff --git a/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java b/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java index 2ff965cd4b..8ec46cfd64 100644 --- a/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java +++ b/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/CellNodeBuffer.java @@ -264,24 +264,21 @@ public class CellNodeBuffer { weight = Config.HIGH_WEIGHT; } - else + else if (isHighWeight(x + 1, y, geoZ)) { - if (isHighWeight(x + 1, y, geoZ)) - { - weight = Config.MEDIUM_WEIGHT; - } - else if (isHighWeight(x - 1, y, geoZ)) - { - weight = Config.MEDIUM_WEIGHT; - } - else if (isHighWeight(x, y + 1, geoZ)) - { - weight = Config.MEDIUM_WEIGHT; - } - else if (isHighWeight(x, y - 1, geoZ)) - { - weight = Config.MEDIUM_WEIGHT; - } + weight = Config.MEDIUM_WEIGHT; + } + else if (isHighWeight(x - 1, y, geoZ)) + { + weight = Config.MEDIUM_WEIGHT; + } + else if (isHighWeight(x, y + 1, geoZ)) + { + weight = Config.MEDIUM_WEIGHT; + } + else if (isHighWeight(x, y - 1, geoZ)) + { + weight = Config.MEDIUM_WEIGHT; } newNode.setParent(_current); diff --git a/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java b/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java index 7e7d6f00fb..4f222b4683 100644 --- a/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java +++ b/trunk/java/com/l2jmobius/gameserver/pathfinding/cellnodes/NodeLoc.java @@ -162,34 +162,6 @@ public class NodeLoc extends AbstractNodeLoc return false; } final NodeLoc other = (NodeLoc) obj; - if (_x != other._x) - { - return false; - } - if (_y != other._y) - { - return false; - } - if (_goNorth != other._goNorth) - { - return false; - } - if (_goEast != other._goEast) - { - return false; - } - if (_goSouth != other._goSouth) - { - return false; - } - if (_goWest != other._goWest) - { - return false; - } - if (_geoHeight != other._geoHeight) - { - return false; - } - return true; + return (_x == other._x) && (_y == other._y) && (!_goNorth == !other._goNorth) && (!_goEast == !other._goEast) && (!_goSouth == !other._goSouth) && (!_goWest == !other._goWest) && (_geoHeight == other._geoHeight); } } diff --git a/trunk/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java b/trunk/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java index a328de0e82..1c45d92624 100644 --- a/trunk/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java +++ b/trunk/java/com/l2jmobius/gameserver/pathfinding/geonodes/GeoNodeLoc.java @@ -98,18 +98,6 @@ public class GeoNodeLoc extends AbstractNodeLoc return false; } final GeoNodeLoc other = (GeoNodeLoc) obj; - if (_x != other._x) - { - return false; - } - if (_y != other._y) - { - return false; - } - if (_z != other._z) - { - return false; - } - return true; + return (_x == other._x) && (_y == other._y) && (_z == other._z); } } diff --git a/trunk/java/com/l2jmobius/gameserver/script/EngineInterface.java b/trunk/java/com/l2jmobius/gameserver/script/EngineInterface.java index 8c516cf5d7..7cd349e04e 100644 --- a/trunk/java/com/l2jmobius/gameserver/script/EngineInterface.java +++ b/trunk/java/com/l2jmobius/gameserver/script/EngineInterface.java @@ -21,7 +21,7 @@ package com.l2jmobius.gameserver.script; */ public interface EngineInterface { - public void addEventDrop(int[] items, int[] count, double chance, DateRange range); + void addEventDrop(int[] items, int[] count, double chance, DateRange range); - public void onPlayerLogin(String message, DateRange range); + void onPlayerLogin(String message, DateRange range); } diff --git a/trunk/java/com/l2jmobius/gameserver/script/ScriptEngine.java b/trunk/java/com/l2jmobius/gameserver/script/ScriptEngine.java index 9ac183191a..46f6d571e6 100644 --- a/trunk/java/com/l2jmobius/gameserver/script/ScriptEngine.java +++ b/trunk/java/com/l2jmobius/gameserver/script/ScriptEngine.java @@ -41,16 +41,16 @@ public class ScriptEngine s = parserFactories.get(name); if (s == null) // if the shape factory is not there even now { - throw (new ParserNotCreatedException()); + throw new ParserNotCreatedException(); } } catch (ClassNotFoundException e) { // We'll throw an exception to indicate that // the shape could not be created - throw (new ParserNotCreatedException()); + throw new ParserNotCreatedException(); } } - return (s.create()); + return s.create(); } } diff --git a/trunk/java/com/l2jmobius/gameserver/scripting/L2ScriptEngineManager.java b/trunk/java/com/l2jmobius/gameserver/scripting/L2ScriptEngineManager.java index 30baa301c3..df80001e6b 100644 --- a/trunk/java/com/l2jmobius/gameserver/scripting/L2ScriptEngineManager.java +++ b/trunk/java/com/l2jmobius/gameserver/scripting/L2ScriptEngineManager.java @@ -62,25 +62,11 @@ public final class L2ScriptEngineManager private File _currentLoadingScript; - // Configs - // TODO move to config file - /** - * Informs(logs) the scripts being loaded.
- * Apply only when executing script from files.
- */ - private static final boolean VERBOSE_LOADING = false; - /** * If the script engine supports compilation the script is compiled before execution.
*/ private static final boolean ATTEMPT_COMPILATION = true; - /** - * Clean an previous error log(if such exists) for the script being loaded before trying to load.
- * Apply only when executing script from files.
- */ - private static final boolean PURGE_ERROR_LOG = true; - protected L2ScriptEngineManager() { final ScriptEngineManager scriptEngineManager = new ScriptEngineManager(); @@ -203,10 +189,6 @@ public final class L2ScriptEngineManager { if (file.isDirectory() && recurseDown && (maxDepth > currentDepth)) { - if (VERBOSE_LOADING) - { - _log.info("Entering folder: " + file.getName()); - } executeAllScriptsInDirectory(file, recurseDown, maxDepth, currentDepth + 1); } else if (file.isFile()) @@ -254,12 +236,6 @@ public final class L2ScriptEngineManager public void executeScript(ScriptEngine engine, File file) throws ScriptException { - if (VERBOSE_LOADING) - { - _log.info("Loading Script: " + file.getAbsolutePath()); - } - - if (PURGE_ERROR_LOG) { final String name = file.getAbsolutePath() + ".error.log"; final File errorLog = new File(name); diff --git a/trunk/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java b/trunk/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java index 494df0f304..c0f43fc817 100644 --- a/trunk/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java +++ b/trunk/java/com/l2jmobius/gameserver/taskmanager/KnownListUpdateTaskManager.java @@ -69,7 +69,7 @@ public class KnownListUpdateTaskManager failed = FAILED_REGIONS.contains(r); // failed on last pass if (r.isActive()) // and check only if the region is active { - updateRegion(r, ((_fullUpdateTimer == FULL_UPDATE_TIMER) || failed), updatePass); + updateRegion(r, (_fullUpdateTimer == FULL_UPDATE_TIMER) || failed, updatePass); } if (failed) { @@ -111,7 +111,7 @@ public class KnownListUpdateTaskManager } // Some mobs need faster knownlist update - final boolean aggro = (Config.GUARD_ATTACK_AGGRO_MOB && (object instanceof L2GuardInstance)); + final boolean aggro = Config.GUARD_ATTACK_AGGRO_MOB && (object instanceof L2GuardInstance); if (forgetObjects) { diff --git a/trunk/java/com/l2jmobius/gameserver/util/Broadcast.java b/trunk/java/com/l2jmobius/gameserver/util/Broadcast.java index 352fb0f7e8..73cd8e5299 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/Broadcast.java +++ b/trunk/java/com/l2jmobius/gameserver/util/Broadcast.java @@ -80,7 +80,7 @@ public final class Broadcast try { player.sendPacket(mov); - if ((mov instanceof CharInfo) && (character.isPlayer())) + if ((mov instanceof CharInfo) && character.isPlayer()) { final int relation = ((L2PcInstance) character).getRelation(player); final Integer oldrelation = character.getKnownList().getKnownRelations().get(player.getObjectId()); diff --git a/trunk/java/com/l2jmobius/gameserver/util/Evolve.java b/trunk/java/com/l2jmobius/gameserver/util/Evolve.java index 2abf1681bf..9cf3cc7b3b 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/Evolve.java +++ b/trunk/java/com/l2jmobius/gameserver/util/Evolve.java @@ -49,7 +49,7 @@ public final class Evolve { protected static final Logger _log = Logger.getLogger(Evolve.class.getName()); - public static final boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) + public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0)) { @@ -160,7 +160,7 @@ public final class Evolve return true; } - public static final boolean doRestore(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) + public static boolean doRestore(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) { if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0)) { diff --git a/trunk/java/com/l2jmobius/gameserver/util/GeoUtils.java b/trunk/java/com/l2jmobius/gameserver/util/GeoUtils.java index 5f2de617c4..8f7ce518be 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/GeoUtils.java +++ b/trunk/java/com/l2jmobius/gameserver/util/GeoUtils.java @@ -206,21 +206,17 @@ public final class GeoUtils return Cell.NSWE_WEST; // Direction.WEST; } } - else - // unchanged x + else if (y > lastY) { - if (y > lastY) - { - return Cell.NSWE_SOUTH; // Direction.SOUTH; - } - else if (y < lastY) - { - return Cell.NSWE_NORTH; // Direction.NORTH; - } - else - { - throw new RuntimeException(); - } + return Cell.NSWE_SOUTH; // Direction.SOUTH; + } + else if (y < lastY) + { + return Cell.NSWE_NORTH; // Direction.NORTH; + } + else + { + throw new RuntimeException(); } } } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator.java b/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator.java index 966fb4fc89..8c62beb3cc 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator.java +++ b/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator.java @@ -81,21 +81,18 @@ public final class LinePointIterator return true; } } - else + else if (_srcY != _dstY) { - if (_srcY != _dstY) + _srcY += _sy; + + _error += _dx; + if (_error >= _dy) { - _srcY += _sy; - - _error += _dx; - if (_error >= _dy) - { - _srcX += _sx; - _error -= _dy; - } - - return true; + _srcX += _sx; + _error -= _dy; } + + return true; } return false; diff --git a/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator3D.java b/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator3D.java index 8c25cccd64..fd8ad241bc 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator3D.java +++ b/trunk/java/com/l2jmobius/gameserver/util/LinePointIterator3D.java @@ -121,28 +121,25 @@ public final class LinePointIterator3D return true; } } - else + else if (_srcZ != _dstZ) { - if (_srcZ != _dstZ) + _srcZ += _sz; + + _error += _dx; + if (_error >= _dz) { - _srcZ += _sz; - - _error += _dx; - if (_error >= _dz) - { - _srcX += _sx; - _error -= _dz; - } - - _error2 += _dy; - if (_error2 >= _dz) - { - _srcY += _sy; - _error2 -= _dz; - } - - return true; + _srcX += _sx; + _error -= _dz; } + + _error2 += _dy; + if (_error2 >= _dz) + { + _srcY += _sy; + _error2 -= _dz; + } + + return true; } return false; diff --git a/trunk/java/com/l2jmobius/gameserver/util/MinionList.java b/trunk/java/com/l2jmobius/gameserver/util/MinionList.java index 73cced0185..ef3f61a31f 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/MinionList.java +++ b/trunk/java/com/l2jmobius/gameserver/util/MinionList.java @@ -45,7 +45,7 @@ public class MinionList /** List containing the cached deleted minions for reuse */ protected List _reusedMinionReferences = null; - private final static List KEEP_MINION_AFTER_DEATH_BOSS_IDS = new ArrayList<>(); + private static final List KEEP_MINION_AFTER_DEATH_BOSS_IDS = new ArrayList<>(); static { KEEP_MINION_AFTER_DEATH_BOSS_IDS.add(26094); @@ -323,14 +323,14 @@ public class MinionList * @param minionId The L2NpcTemplate Identifier of the Minion to spawn * @return */ - public static final L2MonsterInstance spawnMinion(L2MonsterInstance master, int minionId) + public static L2MonsterInstance spawnMinion(L2MonsterInstance master, int minionId) { // Get the template of the Minion to spawn final L2NpcTemplate minionTemplate = NpcData.getInstance().getTemplate(minionId); return minionTemplate == null ? null : initializeNpcInstance(master, new L2MonsterInstance(minionTemplate)); } - protected static final L2MonsterInstance initializeNpcInstance(L2MonsterInstance master, L2MonsterInstance minion) + protected static L2MonsterInstance initializeNpcInstance(L2MonsterInstance master, L2MonsterInstance minion) { minion.stopAllEffects(); minion.setIsDead(false); diff --git a/trunk/java/com/l2jmobius/gameserver/util/Util.java b/trunk/java/com/l2jmobius/gameserver/util/Util.java index c51150b6d1..108539ff4b 100644 --- a/trunk/java/com/l2jmobius/gameserver/util/Util.java +++ b/trunk/java/com/l2jmobius/gameserver/util/Util.java @@ -79,7 +79,7 @@ public final class Util * @param toY * @return degree value of object 2 to the horizontal line with object 1 being the origin */ - public static final double calculateAngleFrom(int fromX, int fromY, int toX, int toY) + public static double calculateAngleFrom(int fromX, int fromY, int toX, int toY) { double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX)); if (angleTarget < 0) @@ -89,12 +89,12 @@ public final class Util return angleTarget; } - public static final double convertHeadingToDegree(int clientHeading) + public static double convertHeadingToDegree(int clientHeading) { return clientHeading / 182.044444444; } - public static final int convertDegreeToClientHeading(double degree) + public static int convertDegreeToClientHeading(double degree) { if (degree < 0) { @@ -103,12 +103,12 @@ public final class Util return (int) (degree * 182.044444444); } - public static final int calculateHeadingFrom(ILocational from, ILocational to) + public static int calculateHeadingFrom(ILocational from, ILocational to) { return calculateHeadingFrom(from.getX(), from.getY(), to.getX(), to.getY()); } - public static final int calculateHeadingFrom(int fromX, int fromY, int toX, int toY) + public static int calculateHeadingFrom(int fromX, int fromY, int toX, int toY) { double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX)); if (angleTarget < 0) @@ -118,7 +118,7 @@ public final class Util return (int) (angleTarget * 182.044444444); } - public static final int calculateHeadingFrom(double dx, double dy) + public static int calculateHeadingFrom(double dx, double dy) { double angleTarget = Math.toDegrees(Math.atan2(dy, dx)); if (angleTarget < 0) @@ -143,7 +143,7 @@ public final class Util public static double calculateDistance(double x1, double y1, double z1, double x2, double y2, double z2, boolean includeZAxis, boolean squared) { final double distance = Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2) + (includeZAxis ? Math.pow(z1 - z2, 2) : 0); - return (squared) ? distance : Math.sqrt(distance); + return squared ? distance : Math.sqrt(distance); } /** @@ -243,7 +243,7 @@ public final class Util if (includeZAxis) { final double dz = obj1.getZ() - obj2.getZ(); - d += (dz * dz); + d += dz * dz; } return d <= ((range * range) + (2 * range * rad) + (rad * rad)); } @@ -459,7 +459,7 @@ public final class Util return (new SimpleDateFormat("yyyy-MM-dd")).format(date.getTime()); } - private static final void buildHtmlBypassCache(L2PcInstance player, HtmlActionScope scope, String html) + private static void buildHtmlBypassCache(L2PcInstance player, HtmlActionScope scope, String html) { final String htmlLower = html.toLowerCase(Locale.ENGLISH); int bypassEnd = 0; @@ -491,7 +491,7 @@ public final class Util } } - private static final void buildHtmlLinkCache(L2PcInstance player, HtmlActionScope scope, String html) + private static void buildHtmlLinkCache(L2PcInstance player, HtmlActionScope scope, String html) { final String htmlLower = html.toLowerCase(Locale.ENGLISH); int linkEnd = 0; @@ -636,32 +636,29 @@ public final class Util activeChar.sendPacket(new ShowBoard(html, "1001")); fillMultiEditContent(activeChar, fillMultiEdit); } + else if (html.length() < 16250) + { + activeChar.sendPacket(new ShowBoard(html, "101")); + activeChar.sendPacket(new ShowBoard(null, "102")); + activeChar.sendPacket(new ShowBoard(null, "103")); + } + else if (html.length() < (16250 * 2)) + { + activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101")); + activeChar.sendPacket(new ShowBoard(html.substring(16250), "102")); + activeChar.sendPacket(new ShowBoard(null, "103")); + } + else if (html.length() < (16250 * 3)) + { + activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101")); + activeChar.sendPacket(new ShowBoard(html.substring(16250, 16250 * 2), "102")); + activeChar.sendPacket(new ShowBoard(html.substring(16250 * 2), "103")); + } else { - if (html.length() < 16250) - { - activeChar.sendPacket(new ShowBoard(html, "101")); - activeChar.sendPacket(new ShowBoard(null, "102")); - activeChar.sendPacket(new ShowBoard(null, "103")); - } - else if (html.length() < (16250 * 2)) - { - activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101")); - activeChar.sendPacket(new ShowBoard(html.substring(16250), "102")); - activeChar.sendPacket(new ShowBoard(null, "103")); - } - else if (html.length() < (16250 * 3)) - { - activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101")); - activeChar.sendPacket(new ShowBoard(html.substring(16250, 16250 * 2), "102")); - activeChar.sendPacket(new ShowBoard(html.substring(16250 * 2), "103")); - } - else - { - activeChar.sendPacket(new ShowBoard("
Error: HTML was too long!
", "101")); - activeChar.sendPacket(new ShowBoard(null, "102")); - activeChar.sendPacket(new ShowBoard(null, "103")); - } + activeChar.sendPacket(new ShowBoard("
Error: HTML was too long!
", "101")); + activeChar.sendPacket(new ShowBoard(null, "102")); + activeChar.sendPacket(new ShowBoard(null, "103")); } } @@ -689,7 +686,7 @@ public final class Util final Collection objs = npc.getKnownList().getKnownObjects().values(); for (L2Object obj : objs) { - if ((obj != null) && (playable && (obj.isPlayable() || obj.isPet()))) + if ((obj != null) && playable && (obj.isPlayable() || obj.isPet())) { if (!invisible && obj.isInvisible()) { @@ -697,7 +694,7 @@ public final class Util } final L2Character cha = (L2Character) obj; - if (((cha.getZ() < (npc.getZ() - 100)) && (cha.getZ() > (npc.getZ() + 100))) || !(GeoData.getInstance().canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), npc.getX(), npc.getY(), npc.getZ()))) + if (((cha.getZ() < (npc.getZ() - 100)) && (cha.getZ() > (npc.getZ() + 100))) || !GeoData.getInstance().canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), npc.getX(), npc.getY(), npc.getZ())) { continue; } diff --git a/trunk/java/com/l2jmobius/loginserver/GameServerThread.java b/trunk/java/com/l2jmobius/loginserver/GameServerThread.java index 834e4811b1..51b7f9af79 100644 --- a/trunk/java/com/l2jmobius/loginserver/GameServerThread.java +++ b/trunk/java/com/l2jmobius/loginserver/GameServerThread.java @@ -135,7 +135,7 @@ public class GameServerThread extends Thread } catch (IOException e) { - final String serverName = (getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"); + final String serverName = getServerId() != -1 ? "[" + getServerId() + "] " + GameServerTable.getInstance().getServerNameById(getServerId()) : "(" + _connectionIPAddress + ")"; final String msg = "GameServer " + serverName + ": Connection lost: " + e.getMessage(); _log.info(msg); broadcastToTelnet(msg); diff --git a/trunk/java/com/l2jmobius/loginserver/LoginController.java b/trunk/java/com/l2jmobius/loginserver/LoginController.java index f3974b8fc9..2a1b21b9d0 100644 --- a/trunk/java/com/l2jmobius/loginserver/LoginController.java +++ b/trunk/java/com/l2jmobius/loginserver/LoginController.java @@ -175,13 +175,13 @@ public class LoginController synchronized (_failedLoginAttemps) { failedLoginAttemps = _failedLoginAttemps.get(addr); - if (failedLoginAttemps == null) + if (failedLoginAttemps != null) { - failedLoginAttemps = 1; + ++failedLoginAttemps; } else { - ++failedLoginAttemps; + failedLoginAttemps = 1; } _failedLoginAttemps.put(addr, failedLoginAttemps); @@ -370,7 +370,7 @@ public class LoginController { try { - return this.removeBanForAddress(InetAddress.getByName(address)); + return removeBanForAddress(InetAddress.getByName(address)); } catch (UnknownHostException e) { diff --git a/trunk/java/com/l2jmobius/loginserver/SessionKey.java b/trunk/java/com/l2jmobius/loginserver/SessionKey.java index 45733a7bcc..08f0d8025a 100644 --- a/trunk/java/com/l2jmobius/loginserver/SessionKey.java +++ b/trunk/java/com/l2jmobius/loginserver/SessionKey.java @@ -73,8 +73,8 @@ public class SessionKey // when server doesn't show license it doesn't send the LoginOk packet, client doesn't have this part of the key then. if (Config.SHOW_LICENCE) { - return ((playOkID1 == key.playOkID1) && (loginOkID1 == key.loginOkID1) && (playOkID2 == key.playOkID2) && (loginOkID2 == key.loginOkID2)); + return (playOkID1 == key.playOkID1) && (loginOkID1 == key.loginOkID1) && (playOkID2 == key.playOkID2) && (loginOkID2 == key.loginOkID2); } - return ((playOkID1 == key.playOkID1) && (playOkID2 == key.playOkID2)); + return (playOkID1 == key.playOkID1) && (playOkID2 == key.playOkID2); } } \ No newline at end of file diff --git a/trunk/java/com/l2jmobius/loginserver/network/clientpackets/L2LoginClientPacket.java b/trunk/java/com/l2jmobius/loginserver/network/clientpackets/L2LoginClientPacket.java index 0578b1d8a8..c51736ce9a 100644 --- a/trunk/java/com/l2jmobius/loginserver/network/clientpackets/L2LoginClientPacket.java +++ b/trunk/java/com/l2jmobius/loginserver/network/clientpackets/L2LoginClientPacket.java @@ -38,7 +38,7 @@ public abstract class L2LoginClientPacket extends ReceivablePacket 0"); System.out.println("3 - Regular accounts only (accessLevel = 0)"); System.out.println("4 - List all"); - while (!(_mode.equals("1") || _mode.equals("2") || _mode.equals("3") || _mode.equals("4"))) + while (!_mode.equals("1") && !_mode.equals("2") && !_mode.equals("3") && !_mode.equals("4")) { System.out.print("Your choice: "); _mode = _scn.next(); diff --git a/trunk/java/com/l2jmobius/tools/dbinstaller/DBOutputInterface.java b/trunk/java/com/l2jmobius/tools/dbinstaller/DBOutputInterface.java index de226a64bb..bbb33ab2a8 100644 --- a/trunk/java/com/l2jmobius/tools/dbinstaller/DBOutputInterface.java +++ b/trunk/java/com/l2jmobius/tools/dbinstaller/DBOutputInterface.java @@ -23,19 +23,19 @@ import java.sql.Connection; */ public interface DBOutputInterface { - public void setProgressIndeterminate(boolean value); + void setProgressIndeterminate(boolean value); - public void setProgressMaximum(int maxValue); + void setProgressMaximum(int maxValue); - public void setProgressValue(int value); + void setProgressValue(int value); - public void setFrameVisible(boolean value); + void setFrameVisible(boolean value); - public void appendToProgressArea(String text); + void appendToProgressArea(String text); - public Connection getConnection(); + Connection getConnection(); - public int requestConfirm(String title, String message, int type); + int requestConfirm(String title, String message, int type); - public void showMessage(String title, String message, int type); + void showMessage(String title, String message, int type); } diff --git a/trunk/java/com/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/trunk/java/com/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index db1e61e34f..c6d845bd98 100644 --- a/trunk/java/com/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/trunk/java/com/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -174,13 +174,13 @@ public class DBDumper fws.print(", "); } - if (dset.getString(i) == null) + if (dset.getString(i) != null) { - fws.print("NULL"); + fws.print("'" + dset.getString(i).replace("\'", "\\\'") + "'"); } else { - fws.print("'" + dset.getString(i).replace("\'", "\\\'") + "'"); + fws.print("NULL"); } isInFirst = false; } diff --git a/trunk/java/com/l2jmobius/tools/dbinstaller/util/swing/SpringUtilities.java b/trunk/java/com/l2jmobius/tools/dbinstaller/util/swing/SpringUtilities.java index 80c6b1c6dc..2b4814e350 100644 --- a/trunk/java/com/l2jmobius/tools/dbinstaller/util/swing/SpringUtilities.java +++ b/trunk/java/com/l2jmobius/tools/dbinstaller/util/swing/SpringUtilities.java @@ -116,13 +116,10 @@ public class SpringUtilities lastRowCons = lastCons; cons.setX(initialXSpring); } - else + // x position depends on previous component + else if (lastCons != null) { - // x position depends on previous component - if (lastCons != null) - { - cons.setX(Spring.sum(lastCons.getConstraint(SpringLayout.EAST), xPadSpring)); - } + cons.setX(Spring.sum(lastCons.getConstraint(SpringLayout.EAST), xPadSpring)); } if ((i / cols) == 0) @@ -130,13 +127,10 @@ public class SpringUtilities // first row cons.setY(initialYSpring); } - else + // y position depends on previous row + else if (lastRowCons != null) { - // y position depends on previous row - if (lastRowCons != null) - { - cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), yPadSpring)); - } + cons.setY(Spring.sum(lastRowCons.getConstraint(SpringLayout.SOUTH), yPadSpring)); } lastCons = cons; } diff --git a/trunk/java/com/l2jmobius/tools/gsregistering/GameServerRegister.java b/trunk/java/com/l2jmobius/tools/gsregistering/GameServerRegister.java index 4f48146fef..ed7e99bbf2 100644 --- a/trunk/java/com/l2jmobius/tools/gsregistering/GameServerRegister.java +++ b/trunk/java/com/l2jmobius/tools/gsregistering/GameServerRegister.java @@ -170,7 +170,7 @@ public class GameServerRegister extends BaseGameServerRegister System.out.print("| "); inUse = GameServerTable.getInstance().hasRegisteredGameServerOnId(e.getKey()); - final String inUseStr = (inUse ? gsInUse : gsFree); + final String inUseStr = inUse ? gsInUse : gsFree; System.out.print(inUseStr); for (int i = inUseStr.length(); i < gsStatusMaxLen; i++) @@ -258,25 +258,22 @@ public class GameServerRegister extends BaseGameServerRegister { System.out.printf("No name for ID: %d" + Config.EOL, id); } + else if (GameServerTable.getInstance().hasRegisteredGameServerOnId(id)) + { + System.out.printf("Are you sure you want to remove GameServer %d - %s?" + Config.EOL, id, name); + try + { + BaseGameServerRegister.unregisterGameServer(id); + System.out.printf("GameServer ID: %d was successfully removed from LoginServer." + Config.EOL, id); + } + catch (SQLException e) + { + showError("An SQL error occurred while trying to remove the GameServer.", e); + } + } else { - if (GameServerTable.getInstance().hasRegisteredGameServerOnId(id)) - { - System.out.printf("Are you sure you want to remove GameServer %d - %s?" + Config.EOL, id, name); - try - { - BaseGameServerRegister.unregisterGameServer(id); - System.out.printf("GameServer ID: %d was successfully removed from LoginServer." + Config.EOL, id); - } - catch (SQLException e) - { - showError("An SQL error occurred while trying to remove the GameServer.", e); - } - } - else - { - System.out.printf("No GameServer is registered on ID: %d" + Config.EOL, id); - } + System.out.printf("No GameServer is registered on ID: %d" + Config.EOL, id); } } @@ -304,22 +301,19 @@ public class GameServerRegister extends BaseGameServerRegister { System.out.printf("No name for ID: %d" + Config.EOL, id); } + else if (GameServerTable.getInstance().hasRegisteredGameServerOnId(id)) + { + System.out.println("This ID is not available."); + } else { - if (GameServerTable.getInstance().hasRegisteredGameServerOnId(id)) + try { - System.out.println("This ID is not available."); + BaseGameServerRegister.registerGameServer(id, "."); } - else + catch (IOException e) { - try - { - BaseGameServerRegister.registerGameServer(id, "."); - } - catch (IOException e) - { - showError("An error saving the hexid file occurred while trying to register the GameServer.", e); - } + showError("An error saving the hexid file occurred while trying to register the GameServer.", e); } } } diff --git a/trunk/java/com/l2jmobius/util/HexUtils.java b/trunk/java/com/l2jmobius/util/HexUtils.java index 25b4d0307b..bd104960a7 100644 --- a/trunk/java/com/l2jmobius/util/HexUtils.java +++ b/trunk/java/com/l2jmobius/util/HexUtils.java @@ -207,7 +207,7 @@ public class HexUtils else { numLines = (len / _HEX_ED_BPL) + 1; - textData = new char[(lineLength * numLines) - (_HEX_ED_BPL - (lenBplMod)) - _NEW_LINE_CHARS.length]; + textData = new char[(lineLength * numLines) - (_HEX_ED_BPL - lenBplMod) - _NEW_LINE_CHARS.length]; } // performance penalty, only doing space filling in the loop is faster @@ -238,7 +238,7 @@ public class HexUtils } else if (dataLen < _HEX_ED_BPL) { - Arrays.fill(textData, (lineHexDataStart + (dataLen * _HEX_ED_CPB)), lineHexDataStart + (dataLen * _HEX_ED_CPB) + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); + Arrays.fill(textData, lineHexDataStart + (dataLen * _HEX_ED_CPB), lineHexDataStart + (dataLen * _HEX_ED_CPB) + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); } else { diff --git a/trunk/java/com/l2jmobius/util/IPSubnet.java b/trunk/java/com/l2jmobius/util/IPSubnet.java index df195c9ee4..c358d9a62f 100644 --- a/trunk/java/com/l2jmobius/util/IPSubnet.java +++ b/trunk/java/com/l2jmobius/util/IPSubnet.java @@ -76,29 +76,26 @@ public class IPSubnet } } } - else + // check for embedded v4 in v6 addr (not done !) + else if (_isIPv4) { - // check for embedded v4 in v6 addr (not done !) - if (_isIPv4) + // my V4 vs V6 + for (int i = 0; i < _addr.length; i++) { - // my V4 vs V6 - for (int i = 0; i < _addr.length; i++) + if ((addr[i + 12] & _mask[i]) != _addr[i]) { - if ((addr[i + 12] & _mask[i]) != _addr[i]) - { - return false; - } + return false; } } - else + } + else + { + // my V6 vs V4 + for (int i = 0; i < _addr.length; i++) { - // my V6 vs V4 - for (int i = 0; i < _addr.length; i++) + if ((addr[i] & _mask[i + 12]) != _addr[i + 12]) { - if ((addr[i] & _mask[i + 12]) != _addr[i + 12]) - { - return false; - } + return false; } } } @@ -112,7 +109,7 @@ public class IPSubnet int size = 0; for (byte element : _mask) { - size += Integer.bitCount((element & 0xFF)); + size += Integer.bitCount(element & 0xFF); } try @@ -136,15 +133,10 @@ public class IPSubnet { return applyMask(((IPSubnet) o).getAddress()); } - if (o instanceof InetAddress) - { - return applyMask(((InetAddress) o).getAddress()); - } - - return false; + return (o instanceof InetAddress) && applyMask(((InetAddress) o).getAddress()); } - private static final byte[] getMask(int n, int maxLength) throws UnknownHostException + private static byte[] getMask(int n, int maxLength) throws UnknownHostException { if ((n > (maxLength << 3)) || (n < 0)) { diff --git a/trunk/java/com/l2jmobius/util/IPv4Filter.java b/trunk/java/com/l2jmobius/util/IPv4Filter.java index ca8919291b..cdcb28dc04 100644 --- a/trunk/java/com/l2jmobius/util/IPv4Filter.java +++ b/trunk/java/com/l2jmobius/util/IPv4Filter.java @@ -48,7 +48,7 @@ public class IPv4Filter implements IAcceptFilter, Runnable * @param ip * @return */ - private static final int hash(byte[] ip) + private static int hash(byte[] ip) { return (ip[0] & 0xFF) | ((ip[1] << 8) & 0xFF00) | ((ip[2] << 16) & 0xFF0000) | ((ip[3] << 24) & 0xFF000000); } diff --git a/trunk/java/com/l2jmobius/util/PrimeFinder.java b/trunk/java/com/l2jmobius/util/PrimeFinder.java index 53487bd834..cb88dea994 100644 --- a/trunk/java/com/l2jmobius/util/PrimeFinder.java +++ b/trunk/java/com/l2jmobius/util/PrimeFinder.java @@ -339,7 +339,7 @@ public final class PrimeFinder * @param desiredCapacity the capacity desired by the user. * @return the capacity which should be used for a hashtable. */ - public static final int nextPrime(int desiredCapacity) + public static int nextPrime(int desiredCapacity) { int i = Arrays.binarySearch(PRIME_CAPACITIES, desiredCapacity); if (i < 0) diff --git a/trunk/java/com/l2jmobius/util/Rnd.java b/trunk/java/com/l2jmobius/util/Rnd.java index 8d60c2d937..1215a66c78 100644 --- a/trunk/java/com/l2jmobius/util/Rnd.java +++ b/trunk/java/com/l2jmobius/util/Rnd.java @@ -303,7 +303,7 @@ public final class Rnd protected static volatile long SEED_UNIQUIFIER = 8682522807148012L; - public static final Random directRandom() + public static Random directRandom() { return rnd.directRandom(); } @@ -313,7 +313,7 @@ public final class Rnd * @return A random double number from 0 to 1 * @see com.l2jmobius.util.Rnd#nextDouble() */ - public static final double get() + public static double get() { return rnd.nextDouble(); } @@ -323,7 +323,7 @@ public final class Rnd * @param n The superior limit (exclusive) * @return A random integer number from 0 to n-1 */ - public static final int get(int n) + public static int get(int n) { return rnd.get(n); } @@ -334,7 +334,7 @@ public final class Rnd * @param max The maximum value * @return A random integer number from min to max */ - public static final int get(int min, int max) + public static int get(int min, int max) { return rnd.get(min, max); } @@ -345,12 +345,12 @@ public final class Rnd * @param max The maximum value * @return A random long number from min to max */ - public static final long get(long min, long max) + public static long get(long min, long max) { return rnd.get(min, max); } - public static final RandomContainer newInstance(RandomType type) + public static RandomContainer newInstance(RandomType type) { switch (type) { @@ -380,7 +380,7 @@ public final class Rnd * @return A random boolean state (true or false) * @see java.util.Random#nextBoolean() */ - public static final boolean nextBoolean() + public static boolean nextBoolean() { return rnd.nextBoolean(); } @@ -390,7 +390,7 @@ public final class Rnd * @param array The array to be filled with random byte numbers * @see java.util.Random#nextBytes(byte[] bytes) */ - public static final void nextBytes(byte[] array) + public static void nextBytes(byte[] array) { rnd.nextBytes(array); } @@ -400,7 +400,7 @@ public final class Rnd * @return A random double number from 0 to 1 * @see java.util.Random#nextDouble() */ - public static final double nextDouble() + public static double nextDouble() { return rnd.nextDouble(); } @@ -410,7 +410,7 @@ public final class Rnd * @return A random integer number from 0 to 1 * @see java.util.Random#nextFloat() */ - public static final float nextFloat() + public static float nextFloat() { return rnd.nextFloat(); } @@ -420,7 +420,7 @@ public final class Rnd * @return A random gaussian double number from 0 to 1 * @see java.util.Random#nextGaussian() */ - public static final double nextGaussian() + public static double nextGaussian() { return rnd.nextGaussian(); } @@ -430,7 +430,7 @@ public final class Rnd * @return A random integer number from Integer.MIN_VALUE to Integer.MAX_VALUE * @see java.util.Random#nextInt() */ - public static final int nextInt() + public static int nextInt() { return rnd.nextInt(); } @@ -440,7 +440,7 @@ public final class Rnd * @return * @see com.l2jmobius.util.Rnd#get(int n) */ - public static final int nextInt(int n) + public static int nextInt(int n) { return get(n); } @@ -450,7 +450,7 @@ public final class Rnd * @return A random integer number from Long.MIN_VALUE to Long.MAX_VALUE * @see java.util.Random#nextLong() */ - public static final long nextLong() + public static long nextLong() { return rnd.nextLong(); } diff --git a/trunk/java/com/l2jmobius/util/crypt/BlowfishEngine.java b/trunk/java/com/l2jmobius/util/crypt/BlowfishEngine.java index 79ac5b20ee..d255958600 100644 --- a/trunk/java/com/l2jmobius/util/crypt/BlowfishEngine.java +++ b/trunk/java/com/l2jmobius/util/crypt/BlowfishEngine.java @@ -1118,7 +1118,7 @@ public final class BlowfishEngine private int func(int x) { - return (((S0[(x >>> 24)] + S1[(x >>> 16) & 0xff]) ^ S2[(x >>> 8) & 0xff]) + S3[x & 0xff]); + return ((S0[(x >>> 24)] + S1[(x >>> 16) & 0xff]) ^ S2[(x >>> 8) & 0xff]) + S3[x & 0xff]; } /** @@ -1436,7 +1436,7 @@ public final class BlowfishEngine */ private int bytesTo32bits(byte[] src, int srcIndex) { - return ((src[srcIndex + 3] & 0xff) << 24) | ((src[srcIndex + 2] & 0xff) << 16) | ((src[srcIndex + 1] & 0xff) << 8) | ((src[srcIndex] & 0xff)); + return ((src[srcIndex + 3] & 0xff) << 24) | ((src[srcIndex + 2] & 0xff) << 16) | ((src[srcIndex + 1] & 0xff) << 8) | (src[srcIndex] & 0xff); } /** diff --git a/trunk/java/com/l2jmobius/util/crypt/NewCrypt.java b/trunk/java/com/l2jmobius/util/crypt/NewCrypt.java index f3ac1f68f1..fcde1580b7 100644 --- a/trunk/java/com/l2jmobius/util/crypt/NewCrypt.java +++ b/trunk/java/com/l2jmobius/util/crypt/NewCrypt.java @@ -162,7 +162,7 @@ public final class NewCrypt while (pos < stop) { - edx = (raw[pos] & 0xFF); + edx = raw[pos] & 0xFF; edx |= (raw[pos + 1] & 0xFF) << 8; edx |= (raw[pos + 2] & 0xFF) << 16; edx |= (raw[pos + 3] & 0xFF) << 24; diff --git a/trunk/java/com/l2jmobius/util/data/xml/IXmlReader.java b/trunk/java/com/l2jmobius/util/data/xml/IXmlReader.java index 94643d2482..b9e7418a23 100644 --- a/trunk/java/com/l2jmobius/util/data/xml/IXmlReader.java +++ b/trunk/java/com/l2jmobius/util/data/xml/IXmlReader.java @@ -38,17 +38,17 @@ import com.l2jmobius.util.file.filter.XMLFilter; */ public interface IXmlReader { - static final Logger LOGGER = Logger.getLogger(IXmlReader.class.getName()); - static final String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; - static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; + Logger LOGGER = Logger.getLogger(IXmlReader.class.getName()); + String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; + String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema"; /** The default file filter, ".xml" files only. */ - static final XMLFilter XML_FILTER = new XMLFilter(); + XMLFilter XML_FILTER = new XMLFilter(); /** * This method can be used to load/reload the data.
* It's highly recommended to clear the data storage, either the list or map. */ - public void load(); + void load(); /** * Wrapper for {@link #parseFile(File)} method.