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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/dist/game/data/scripts/ai/atelia_fortess/AteliaStatus/AteliaStatus.java vendored
View File

@@ -605,21 +605,15 @@ final class AteliaStatus extends AbstractNpcAI
final int chance = getRandom(1000);
if (Util.contains(ATELIA_CURSE, npc.getId()))
{
if (!npc.isCastingNow())
if (!npc.isCastingNow() && (chance <= 20))
{
if (chance <= 20)
{
npc.setTarget(attacker);
npc.doCast(ATELIA_POISON[getRandom(ATELIA_POISON.length)].getSkill());
}
npc.setTarget(attacker);
npc.doCast(ATELIA_POISON[getRandom(ATELIA_POISON.length)].getSkill());
}
}
else if (Util.contains(FLOOR_MOBS, npc.getId()))
else if (Util.contains(FLOOR_MOBS, npc.getId()) && (chance > 90))
{
if (chance > 90)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ATELIA_MSG[getRandom(1)], attacker.getName());
}
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ATELIA_MSG[getRandom(1)], attacker.getName());
}
return super.onAttack(npc, attacker, damage, isSummon);
}

6
trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java vendored
View File

@@ -75,11 +75,7 @@ final class HandysBlockCheckerEvent extends Quest
player.sendPacket(tl);
final int countBlue = holder.getBlueTeamSize();
final int countRed = holder.getRedTeamSize();
final int minMembers = Config.MIN_BLOCK_CHECKER_TEAM_MEMBERS;
if ((countBlue >= minMembers) && (countRed >= minMembers))
if ((holder.getBlueTeamSize() >= Config.MIN_BLOCK_CHECKER_TEAM_MEMBERS) && (holder.getRedTeamSize() >= Config.MIN_BLOCK_CHECKER_TEAM_MEMBERS))
{
holder.updateEvent();
holder.broadCastPacketToTeam(new ExCubeGameRequestReady());

3
trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java vendored
View File

@@ -308,8 +308,7 @@ final class MC_Show extends AbstractNpcAI
diff = hourDiff + minDiff;
if (Config.DEBUG)
{
final SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
_log.info("Fantasy Isle: MC show script starting at " + format.format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours.");
_log.info("Fantasy Isle: MC show script starting at " + (new SimpleDateFormat("dd/MM/yyyy HH:mm:ss")).format(System.currentTimeMillis() + diff) + " and is scheduled each next 4 hours.");
}
// TODO startRepeatingQuestTimer("Start", diff, 14400000, null, null);
// missing option to provide different initial delay

36
trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java vendored
View File

@@ -137,8 +137,7 @@ final class Parade extends AbstractNpcAI
// final long diff = timeLeftMilli(8, 0, 0), cycle = 600000L;
// ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new Start(), 180000L, cycle);
final SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm");
_log.info("Fantasy Isle: Parade starting at " + format.format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours.");
_log.info("Fantasy Isle: Parade starting at " + new SimpleDateFormat("yyyy/MM/dd HH:mm").format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours.");
}
void load()
@@ -214,27 +213,28 @@ final class Parade extends AbstractNpcAI
@Override
public void run()
{
if (spawns.size() > 0)
if (spawns.size() <= 0)
{
for (L2Npc actor : spawns)
return;
}
for (L2Npc actor : spawns)
{
if (actor != null)
{
if (actor != null)
if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100))
{
if (actor.calculateDistance(actor.getXdestination(), actor.getYdestination(), 0, false, true) < (100 * 100))
{
actor.deleteMe();
spawns.remove(actor);
}
else if (!actor.isMoving())
{
actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(actor.getXdestination(), actor.getYdestination(), actor.getZdestination(), actor.getHeading()));
}
actor.deleteMe();
spawns.remove(actor);
}
else if (!actor.isMoving())
{
actor.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(actor.getXdestination(), actor.getYdestination(), actor.getZdestination(), actor.getHeading()));
}
}
if (spawns.size() == 0)
{
deleteTask.cancel(false);
}
}
if (spawns.size() == 0)
{
deleteTask.cancel(false);
}
}
}

3
trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java vendored
View File

@@ -224,8 +224,7 @@ final class ArcanRitual extends Quest
player.sendPacket(trigger);
if (message)
{
final L2GameServerPacket sm = new ExShowScreenMessage(NpcStringId.DARK_POWER_SEEPS_OUT_FROM_THE_MIDDLE_OF_THE_TOWN, ExShowScreenMessage.TOP_CENTER, 5000);
player.sendPacket(sm);
player.sendPacket(new ExShowScreenMessage(NpcStringId.DARK_POWER_SEEPS_OUT_FROM_THE_MIDDLE_OF_THE_TOWN, ExShowScreenMessage.TOP_CENTER, 5000));
}
}
}

16
trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java vendored
View File

@@ -230,12 +230,9 @@ final class BeastFarm extends AbstractNpcAI
public void spawnNext(L2Npc npc, L2PcInstance player, int nextNpcId, int food)
{
// remove the feedinfo of the mob that got despawned, if any
if (FEED_INFO.containsKey(npc.getObjectId()))
if (FEED_INFO.containsKey(npc.getObjectId()) && (FEED_INFO.get(npc.getObjectId()) == player.getObjectId()))
{
if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
{
FEED_INFO.remove(npc.getObjectId());
}
FEED_INFO.remove(npc.getObjectId());
}
// despawn the old mob
// TODO: same code? FIXED?
@@ -322,12 +319,7 @@ final class BeastFarm extends AbstractNpcAI
// first gather some values on local variables
final int objectId = npc.getObjectId();
int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
{
growthLevel = GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel();
}
final int growthLevel = GROWTH_CAPABLE_MONSTERS.containsKey(npcId) ? GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel() : 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
// prevent exploit which allows 2 players to simultaneously raise the same 0-growth beast
// If the mob is at 0th level (when it still listens to all feeders) lock it to the first feeder!
if ((growthLevel == 0) && FEED_INFO.containsKey(objectId))
@@ -364,7 +356,7 @@ final class BeastFarm extends AbstractNpcAI
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
else if ((growthLevel > 0) && (FEED_INFO.get(objectId) != caster.getObjectId()))
if ((growthLevel > 0) && (FEED_INFO.get(objectId) != caster.getObjectId()))
{
// check if this is the same player as the one who raised it from growth 0.
// if no, then do not allow a chance to raise the pet (food gets consumed but has no effect).

20
trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java vendored
View File

@@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.zone.type.L2EffectZone;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
@@ -109,9 +108,7 @@ final class DenOfEvil extends AbstractNpcAI
private int getSkillIdByNpcId(int npcId)
{
int diff = npcId - EYE_IDS[0];
diff *= 2;
return SKILL_ID + diff;
return SKILL_ID + ((npcId - EYE_IDS[0]) * 2);
}
@Override
@@ -211,22 +208,13 @@ final class DenOfEvil extends AbstractNpcAI
}
if (character.isPlayable())
{
final Skill skill = SkillData.getInstance().getSkill(6149, 1);
skill.applyEffects(character, character);
SkillData.getInstance().getSkill(6149, 1).applyEffects(character, character);
}
else
{
if (character.doDie(null)) // mobs die
if (character.doDie(null) && character.isNpc() && Util.contains(EYE_IDS, ((L2Npc) character).getId())) // mobs die
{
if (character.isNpc())
{
// respawn eye
final L2Npc npc = (L2Npc) character;
if (Util.contains(EYE_IDS, npc.getId()))
{
ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(npc.getLocation()), 15000);
}
}
ThreadPoolManager.getInstance().scheduleAi(new RespawnNewEye(((L2Npc) character).getLocation()), 15000);
}
}
}

45
trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java vendored
View File

@@ -151,19 +151,13 @@ final class FeedableBeasts extends AbstractNpcAI
public Integer getMob(int spice, int mobType, int classType)
{
if (_spiceToMob.containsKey(spice))
{
return _spiceToMob.get(spice)[mobType][classType];
}
return null;
return _spiceToMob.containsKey(spice) ? _spiceToMob.get(spice)[mobType][classType] : null;
}
public Integer getRandomMob(int spice)
{
int[][] temp;
temp = _spiceToMob.get(spice);
final int rand = getRandom(temp[0].length);
return temp[0][rand];
final int[][] temp = _spiceToMob.get(spice);
return temp[0][getRandom(temp[0].length)];
}
public Integer getChance()
@@ -482,24 +476,20 @@ final class FeedableBeasts extends AbstractNpcAI
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null))
if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
{
if (MAD_COW_POLYMORPH.containsKey(npc.getId()))
// remove the feed info from the previous mob
if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
{
// remove the feed info from the previous mob
if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
{
FEED_INFO.remove(npc.getObjectId());
}
// despawn the mad cow
npc.deleteMe();
// spawn the new mob
final L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
// register the player in the feedinfo for the mob that just spawned
FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
addAttackDesire(nextNpc, player);
FEED_INFO.remove(npc.getObjectId());
}
// despawn the mad cow
npc.deleteMe();
// spawn the new mob
final L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
// register the player in the feedinfo for the mob that just spawned
FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
addAttackDesire(nextNpc, player);
}
return super.onAdvEvent(event, npc, player);
}
@@ -524,12 +514,7 @@ final class FeedableBeasts extends AbstractNpcAI
// first gather some values on local variables
final int objectId = npc.getObjectId();
int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
{
growthLevel = GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel();
}
final int growthLevel = GROWTH_CAPABLE_MONSTERS.containsKey(npcId) ? GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel() : 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
// prevent exploit which allows 2 players to simultaneously raise the same 0-growth beast
// If the mob is at 0th level (when it still listens to all feeders) lock it to the first feeder!
if ((growthLevel == 0) && FEED_INFO.containsKey(objectId))

15
trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java vendored
View File

@@ -432,20 +432,13 @@ final class MinionSpawnManager extends AbstractNpcAI
@Override
public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
{
if (npc.isMonster())
if (npc.isMonster() && !((L2MonsterInstance) npc).isTeleporting() && (getRandom(1, 100) <= npc.getTemplate().getParameters().getInt("SummonPrivateRate", 0)))
{
final L2MonsterInstance monster = (L2MonsterInstance) npc;
if (!monster.isTeleporting())
for (MinionHolder is : npc.getTemplate().getParameters().getMinionList("Privates"))
{
if (getRandom(1, 100) <= npc.getTemplate().getParameters().getInt("SummonPrivateRate", 0))
{
for (MinionHolder is : npc.getTemplate().getParameters().getMinionList("Privates"))
{
addMinion((L2MonsterInstance) npc, is.getId());
}
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ON_ATTACK_MSG[getRandom(ON_ATTACK_MSG.length)]);
}
addMinion((L2MonsterInstance) npc, is.getId());
}
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ON_ATTACK_MSG[getRandom(ON_ATTACK_MSG.length)]);
}
return super.onAttack(npc, attacker, damage, isSummon);
}

19
trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java vendored
View File

@@ -89,20 +89,17 @@ final class PolymorphingOnAttack extends AbstractNpcAI
if (npc.isVisible() && !npc.isDead())
{
final List<Integer> tmp = MOBSPAWNS.get(npc.getId());
if (tmp != null)
if ((tmp != null) && (npc.getCurrentHp() <= ((npc.getMaxHp() * tmp.get(1)) / 100.0)) && (getRandom(100) < tmp.get(2)))
{
if ((npc.getCurrentHp() <= ((npc.getMaxHp() * tmp.get(1)) / 100.0)) && (getRandom(100) < tmp.get(2)))
if (tmp.get(3) >= 0)
{
if (tmp.get(3) >= 0)
{
final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)];
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString));
}
npc.deleteMe();
final L2Attackable newNpc = (L2Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
final L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker;
addAttackDesire(newNpc, originalAttacker);
final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)];
npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString));
}
npc.deleteMe();
final L2Attackable newNpc = (L2Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
final L2Character originalAttacker = isSummon ? attacker.getServitors().values().stream().findFirst().orElse(attacker.getPet()) : attacker;
addAttackDesire(newNpc, originalAttacker);
}
}
return super.onAttack(npc, attacker, damage, isSummon);

21
trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java vendored
View File

@@ -322,8 +322,7 @@ final class PrimevalIsle extends AbstractNpcAI
{
if ((characters != null) && (characters.isAttackable()) && (getRandomBoolean()))
{
final L2Attackable monster = (L2Attackable) characters;
addAttackDesire(monster, playable);
addAttackDesire(((L2Attackable) characters), playable);
}
}
}
@@ -424,21 +423,15 @@ final class PrimevalIsle extends AbstractNpcAI
if (target != null)
{
if (getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER")))
if ((getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER"))) && !npc.isSkillDisabled(physicalSpecial1.getSkill()))
{
if (!npc.isSkillDisabled(physicalSpecial1.getSkill()))
{
npc.setTarget(target);
npc.doCast(physicalSpecial1.getSkill());
}
npc.setTarget(target);
npc.doCast(physicalSpecial1.getSkill());
}
if (getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER")))
if ((getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER"))) && !npc.isSkillDisabled(physicalSpecial2.getSkill()))
{
if (!npc.isSkillDisabled(physicalSpecial2.getSkill()))
{
npc.setTarget(target);
npc.doCast(physicalSpecial2.getSkill());
}
npc.setTarget(target);
npc.doCast(physicalSpecial2.getSkill());
}
}
}

11
trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java vendored
View File

@@ -78,14 +78,11 @@ final class PrisonGuards extends AbstractNpcAI
{
if (player.isAffectedBySkill(TIMER))
{
if ((getRandom(100) < 10) && (npc.calculateDistance(player, true, false) < 100))
if ((getRandom(100) < 10) && (npc.calculateDistance(player, true, false) < 100) && (getQuestItemsCount(player, STAMP) <= 3) && npc.isScriptValue(0))
{
if ((getQuestItemsCount(player, STAMP) <= 3) && npc.isScriptValue(0))
{
giveItems(player, STAMP, 1);
npc.setScriptValue(1);
startQuestTimer("CLEAR_STATUS", 600000, npc, null);
}
giveItems(player, STAMP, 1);
npc.setScriptValue(1);
startQuestTimer("CLEAR_STATUS", 600000, npc, null);
}
}
else

23
trunk/dist/game/data/scripts/ai/group_template/Remnants.java vendored
View File

@@ -58,28 +58,9 @@ final class Remnants extends AbstractNpcAI
@Override
public final String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
{
if (skill.getId() == SKILL_HOLY_WATER)
if ((skill.getId() == SKILL_HOLY_WATER) && !npc.isDead() && (targets.length > 0) && (targets[0] == npc) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)))
{
if (!npc.isDead())
{
if ((targets.length > 0) && (targets[0] == npc))
{
if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) // Lower, than 2%
{
npc.doDie(caster);
//@formatter:off
/*if (npc.getNpcId() == DEREK)
{
caster.sendMessage(MSG_DEREK);
}
else
{
caster.sendMessage(MSG);
}*/
//@formatter:on
}
}
}
npc.doDie(caster);
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}

3
trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java vendored
View File

@@ -170,8 +170,7 @@ final class StakatoNest extends AbstractNpcAI
{
if (killer.isInParty())
{
final List<L2PcInstance> party = killer.getParty().getMembers();
for (L2PcInstance member : party)
for (L2PcInstance member : killer.getParty().getMembers())
{
giveCocoon(member, npc);
}

11
trunk/dist/game/data/scripts/ai/group_template/SummonPc.java vendored
View File

@@ -65,16 +65,9 @@ final class SummonPc extends AbstractNpcAI
doSummonPc(npc, attacker);
}
}
else if (distance > MIN_DISTANCE_MOST_HATED)
else if ((distance > MIN_DISTANCE_MOST_HATED) && (((L2Attackable) npc).getMostHated() != null) && (((((L2Attackable) npc).getMostHated() == attacker) && (chance < 50)) || (chance < 10)))
{
final L2Attackable monster = (L2Attackable) npc;
if (monster.getMostHated() != null)
{
if (((monster.getMostHated() == attacker) && (chance < 50)) || (chance < 10))
{
doSummonPc(npc, attacker);
}
}
doSummonPc(npc, attacker);
}
return super.onAttack(npc, attacker, damage, isSummon);
}

4
trunk/dist/game/data/scripts/ai/individual/Anais.java vendored
View File

@@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.quest.QuestTimer;
import ai.npc.AbstractNpcAI;
@@ -62,8 +61,7 @@ final class Anais extends AbstractNpcAI
if (pot < 4)
{
_current = npc;
final QuestTimer checkAround = getQuestTimer("CHECK", anais, null);
if (checkAround == null) // || !checkAround.getIsActive()
if (getQuestTimer("CHECK", anais, null) == null)
{
startQuestTimer("CHECK", 3000, anais, null);
}

9
trunk/dist/game/data/scripts/ai/individual/Antharas/Antharas.java vendored
View File

@@ -633,13 +633,10 @@ public final class Antharas extends AbstractNpcAI
attacker.teleToLocation(80464, 152294, -3534);
}
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTH_ANTI_STRIDER.getSkillId()))
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTH_ANTI_STRIDER.getSkillId()) && npc.checkDoCastConditions(ANTH_ANTI_STRIDER.getSkill()))
{
if (npc.checkDoCastConditions(ANTH_ANTI_STRIDER.getSkill()))
{
npc.setTarget(attacker);
npc.doCast(ANTH_ANTI_STRIDER.getSkill());
}
npc.setTarget(attacker);
npc.doCast(ANTH_ANTI_STRIDER.getSkill());
}
if (skill == null)

9
trunk/dist/game/data/scripts/ai/individual/Baium/Baium.java vendored
View File

@@ -484,13 +484,10 @@ public final class Baium extends AbstractNpcAI
if (npc.getId() == BAIUM)
{
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()))
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(ANTI_STRIDER.getSkillId()) && !npc.isSkillDisabled(ANTI_STRIDER.getSkill()))
{
if (!npc.isSkillDisabled(ANTI_STRIDER.getSkill()))
{
npc.setTarget(attacker);
npc.doCast(ANTI_STRIDER.getSkill());
}
npc.setTarget(attacker);
npc.doCast(ANTI_STRIDER.getSkill());
}
if (skill == null)

9
trunk/dist/game/data/scripts/ai/individual/Ballista.java vendored
View File

@@ -74,13 +74,10 @@ final class Ballista extends AbstractNpcAI
{
if ((skill != null) && (caster.getTarget() == npc) && (getRandom(100) < 40) && (skill == BOMB.getSkill()))
{
if (npc.getFort().getSiege().isInProgress())
if (npc.getFort().getSiege().isInProgress() && (caster.getClan() != null) && (caster.getClan().getLevel() >= MIN_CLAN_LV))
{
if ((caster.getClan() != null) && (caster.getClan().getLevel() >= MIN_CLAN_LV))
{
caster.getClan().addReputationScore(Config.BALLISTA_POINTS, true);
caster.sendPacket(SystemMessageId.THE_BALLISTA_HAS_BEEN_SUCCESSFULLY_DESTROYED_THE_CLAN_REPUTATION_WILL_BE_INCREASED);
}
caster.getClan().addReputationScore(Config.BALLISTA_POINTS, true);
caster.sendPacket(SystemMessageId.THE_BALLISTA_HAS_BEEN_SUCCESSFULLY_DESTROYED_THE_CLAN_REPUTATION_WILL_BE_INCREASED);
}
npc.doDie(caster);
}

22
trunk/dist/game/data/scripts/ai/individual/Beleth.java vendored
View File

@@ -610,13 +610,10 @@ final class Beleth extends AbstractNpcAI
{
if (!npc.isDead() && !npc.isCastingNow())
{
if (getRandom(100) < 40)
if ((getRandom(100) < 40) && !npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
{
if (!npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
{
npc.doCast(BLEED.getSkill());
return null;
}
npc.doCast(BLEED.getSkill());
return null;
}
npc.setTarget(player);
npc.doCast(FIREBALL.getSkill());
@@ -637,9 +634,7 @@ final class Beleth extends AbstractNpcAI
{
npc.setTarget(player);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
final double speed = npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed();
final int time = (int) (((distance2 - 890) / speed) * 1000);
startQuestTimer("CAST", time, npc, null);
startQuestTimer("CAST", ((int) (((distance2 - 890) / (npc.isRunning() ? npc.getRunSpeed() : npc.getWalkSpeed())) * 1000)), npc, null);
}
else if (distance2 < 890)
{
@@ -648,13 +643,10 @@ final class Beleth extends AbstractNpcAI
}
return null;
}
if (getRandom(100) < 40)
if ((getRandom(100) < 40) && !npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
{
if (!npc.getKnownList().getKnownPlayersInRadius(200).isEmpty())
{
npc.doCast(LIGHTENING.getSkill());
return null;
}
npc.doCast(LIGHTENING.getSkill());
return null;
}
for (L2PcInstance plr : npc.getKnownList().getKnownPlayersInRadius(950))
{

7
trunk/dist/game/data/scripts/ai/individual/Core.java vendored
View File

@@ -63,20 +63,15 @@ final class Core extends AbstractNpcAI
_firstAttacked = false;
final StatsSet info = GrandBossManager.getInstance().getStatsSet(CORE);
final int status = GrandBossManager.getInstance().getBossStatus(CORE);
if (status == DEAD)
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
{
// load the unlock date and time for Core from DB
final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
// if Core is locked until a certain time, mark it so and start the unlock timer
// the unlock time has not yet expired.
if (temp > 0)
{
startQuestTimer("core_unlock", temp, null, null);
}
else
{
// the time has already expired while the server was offline. Immediately spawn Core.
final L2GrandBossInstance core = (L2GrandBossInstance) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
spawnBoss(core);

33
trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java vendored
View File

@@ -206,25 +206,22 @@ final class DarkWaterDragon extends AbstractNpcAI
{
final int npcId = npc.getId();
final int npcObjId = npc.getObjectId();
if (npcId == FAFURION)
if ((npcId == FAFURION) && !MY_TRACKING_SET.contains(npcObjId))
{
if (!MY_TRACKING_SET.contains(npcObjId))
{
MY_TRACKING_SET.add(npcObjId);
// Spawn 4 Detractors on spawn of Fafurion
final int x = npc.getX();
final int y = npc.getY();
addSpawn(DETRACTOR2, x + 100, y + 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR1, x + 100, y - 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR2, x - 100, y + 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR1, x - 100, y - 100, npc.getZ(), 0, false, 40000);
startQuestTimer("first_spawn", 2000, npc, null); // timer to delay timer "1"
startQuestTimer("second_spawn", 4000, npc, null); // timer to delay timer "2"
startQuestTimer("third_spawn", 8000, npc, null); // timer to delay timer "3"
startQuestTimer("fourth_spawn", 10000, npc, null); // timer to delay timer "4"
startQuestTimer("fafurion_poison", 3000, npc, null, true); // Every three seconds reduces Fafurions hp like it is poisoned
startQuestTimer("fafurion_despawn", 120000, npc, null); // Fafurion Kindred disappears after two minutes
}
MY_TRACKING_SET.add(npcObjId);
// Spawn 4 Detractors on spawn of Fafurion
final int x = npc.getX();
final int y = npc.getY();
addSpawn(DETRACTOR2, x + 100, y + 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR1, x + 100, y - 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR2, x - 100, y + 100, npc.getZ(), 0, false, 40000);
addSpawn(DETRACTOR1, x - 100, y - 100, npc.getZ(), 0, false, 40000);
startQuestTimer("first_spawn", 2000, npc, null);
startQuestTimer("second_spawn", 4000, npc, null);
startQuestTimer("third_spawn", 8000, npc, null);
startQuestTimer("fourth_spawn", 10000, npc, null);
startQuestTimer("fafurion_poison", 3000, npc, null, true);
startQuestTimer("fafurion_despawn", 120000, npc, null);
}
return super.onSpawn(npc);
}

6
trunk/dist/game/data/scripts/ai/individual/Devno.java vendored
View File

@@ -64,15 +64,11 @@ final class Devno extends AbstractNpcAI
{
if (event.equalsIgnoreCase("npc_move") && (npc != null))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, DEVNO_SHOUT[getRandom(3)], 1000);
if (getRandom(100) > 40)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, DEVNO_SHOUT[getRandom(3)], 1000);
addMoveToDesire(npc, DEVNO_LOC[getRandom(10)], 0);
}
else
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, DEVNO_SHOUT[getRandom(3)], 1000);
}
}
return null;
}

6
trunk/dist/game/data/scripts/ai/individual/Eleve.java vendored
View File

@@ -63,15 +63,11 @@ final class Eleve extends AbstractNpcAI
{
if (event.equalsIgnoreCase("npc_move") && (npc != null))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ELEVE_SHOUT[getRandom(2)], 1000);
if (getRandom(100) > 40)
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ELEVE_SHOUT[getRandom(2)], 1000);
addMoveToDesire(npc, ELEVE_LOC[getRandom(10)], 0);
}
else
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, ELEVE_SHOUT[getRandom(2)], 1000);
}
}
return null;
}

3
trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java vendored
View File

@@ -122,8 +122,7 @@ final class FrightenedRagnaOrc extends AbstractNpcAI
}
else
{
final NpcStringId msg = 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, msg);
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);
}

4
trunk/dist/game/data/scripts/ai/individual/Handermonkey.java vendored
View File

@@ -45,9 +45,7 @@ final class Handermonkey extends AbstractNpcAI
{
if (getRandom(100) > 30)
{
final int locX = (npc.getSpawn().getX() - 70) + getRandom(100);
final int locY = (npc.getSpawn().getY() - 70) + getRandom(100);
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(locX, locY, npc.getZ(), 0));
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(((npc.getSpawn().getX() - 70) + getRandom(100)), ((npc.getSpawn().getY() - 70) + getRandom(100)), npc.getZ(), 0));
}
else
{

15
trunk/dist/game/data/scripts/ai/individual/Orfen.java vendored
View File

@@ -89,8 +89,7 @@ final class Orfen extends AbstractNpcAI
_IsTeleported = false;
ZONE = GrandBossManager.getInstance().getZone(POS[0]);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);
final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
if (status == DEAD)
if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
{
// load the unlock date and time for Orfen from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -309,13 +308,10 @@ final class Orfen extends AbstractNpcAI
npc.doCast(SkillData.getInstance().getSkill(4064, 1));
}
}
else if (npcId == RIBA_IREN)
else if ((npcId == RIBA_IREN) && !npc.isCastingNow() && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2.0)))
{
if (!npc.isCastingNow() && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2.0)))
{
npc.setTarget(attacker);
npc.doCast(SkillData.getInstance().getSkill(4516, 1));
}
npc.setTarget(attacker);
npc.doCast(SkillData.getInstance().getSkill(4516, 1));
}
return super.onAttack(npc, attacker, damage, isSummon);
}
@@ -328,8 +324,7 @@ final class Orfen extends AbstractNpcAI
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM);
respawnTime *= 3600000;
final long respawnTime = (Config.ORFEN_SPAWN_INTERVAL + getRandom(-Config.ORFEN_SPAWN_RANDOM, Config.ORFEN_SPAWN_RANDOM)) * 3600000;
startQuestTimer("orfen_unlock", respawnTime, null, null);
// also save the respawn time so that the info is maintained past reboots
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);

21
trunk/dist/game/data/scripts/ai/individual/QueenAnt.java vendored
View File

@@ -94,8 +94,7 @@ final class QueenAnt extends AbstractNpcAI
_zone = GrandBossManager.getInstance().getZone(QUEEN_X, QUEEN_Y, QUEEN_Z);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(QUEEN);
final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
if (status == DEAD)
if (GrandBossManager.getInstance().getBossStatus(QUEEN) == DEAD)
{
// load the unlock date and time for queen ant from DB
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -121,7 +120,6 @@ final class QueenAnt extends AbstractNpcAI
final int heading = info.getInt("heading");
final int hp = info.getInt("currentHP");
final int mp = info.getInt("currentMP");
final L2GrandBossInstance queen = (L2GrandBossInstance) addSpawn(QUEEN, loc_x, loc_y, loc_z, heading, false, 0);
queen.setCurrentHpMp(hp, mp);
spawnBoss(queen);
@@ -264,13 +262,10 @@ final class QueenAnt extends AbstractNpcAI
return super.onFactionCall(npc, caller, attacker, isSummon);
}
if (!npc.isCastingNow() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST))
if (!npc.isCastingNow() && (npc.getAI().getIntention() != CtrlIntention.AI_INTENTION_CAST) && (caller.getCurrentHp() < caller.getMaxHp()))
{
if (caller.getCurrentHp() < caller.getMaxHp())
{
npc.setTarget(caller);
((L2Attackable) npc).useMagic(HEAL1.getSkill());
}
npc.setTarget(caller);
((L2Attackable) npc).useMagic(HEAL1.getSkill());
}
return null;
}
@@ -341,8 +336,7 @@ final class QueenAnt extends AbstractNpcAI
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM);
respawnTime *= 3600000;
final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;
startQuestTimer("queen_unlock", respawnTime, null, null);
cancelQuestTimer("action", npc, null);
cancelQuestTimer("heal", null, null);
@@ -364,10 +358,9 @@ final class QueenAnt extends AbstractNpcAI
{
if (npcId == ROYAL)
{
final L2MonsterInstance mob = (L2MonsterInstance) npc;
if (mob.getLeader() != null)
if (((L2MonsterInstance) npc).getLeader() != null)
{
mob.getLeader().getMinionList().onMinionDie(mob, (280 + getRandom(40)) * 1000);
((L2MonsterInstance) npc).getLeader().getMinionList().onMinionDie(((L2MonsterInstance) npc), (280 + getRandom(40)) * 1000);
}
}
else if (npcId == NURSE)

45
trunk/dist/game/data/scripts/ai/individual/Valakas.java vendored
View File

@@ -220,24 +220,21 @@ public final class Valakas extends AbstractNpcAI
else if (event.equalsIgnoreCase("regen_task"))
{
// Inactivity task - 15min
if (GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING)
if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
{
if ((_timeTracker + 900000) < System.currentTimeMillis())
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
npc.teleToLocation(VALAKAS_REGENERATION_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Drop all players from the zone.
ZONE.oustAllPlayers();
// Cancel skill_task and regen_task.
cancelQuestTimer("regen_task", npc, null);
cancelQuestTimer("skill_task", npc, null);
return null;
}
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
npc.teleToLocation(VALAKAS_REGENERATION_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Drop all players from the zone.
ZONE.oustAllPlayers();
// Cancel skill_task and regen_task.
cancelQuestTimer("regen_task", npc, null);
cancelQuestTimer("skill_task", npc, null);
return null;
}
// Verify if "Valakas Regeneration" skill is active.
@@ -403,14 +400,10 @@ public final class Valakas extends AbstractNpcAI
}
// Debuff strider-mounted players.
if (attacker.getMountType() == MountType.STRIDER)
if ((attacker.getMountType() == MountType.STRIDER) && !attacker.isAffectedBySkill(4258))
{
final Skill skill = SkillData.getInstance().getSkill(4258, 1);
if (!attacker.isAffectedBySkill(4258))
{
npc.setTarget(attacker);
npc.doCast(skill);
}
npc.setTarget(attacker);
npc.doCast(SkillData.getInstance().getSkill(4258, 1));
}
_timeTracker = System.currentTimeMillis();
@@ -439,9 +432,7 @@ public final class Valakas extends AbstractNpcAI
GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
// Calculate Min and Max respawn times randomly.
long respawnTime = Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM);
respawnTime *= 3600000;
final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
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);

3
trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java vendored
View File

@@ -113,8 +113,7 @@ final class Venom extends AbstractNpcAI
final long currentTime = System.currentTimeMillis();
final long startSiegeDate = CastleManager.getInstance().getCastleById(CASTLE).getSiegeDate().getTimeInMillis();
final long openingDungeonDate = startSiegeDate - (HOURS_BEFORE * 360000);
if ((currentTime > openingDungeonDate) && (currentTime < startSiegeDate))
if ((currentTime > (startSiegeDate - (HOURS_BEFORE * 360000))) && (currentTime < startSiegeDate))
{
_prisonIsOpen = true;
}

33
trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java vendored
View File

@@ -76,22 +76,19 @@ final class Alarm extends AbstractNpcAI
}
case "RECORDER_CRUSHED":
{
if (npc0 != null)
if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED"))
{
if (npc0.getVariables().getBoolean("SPAWNED"))
npc0.getVariables().set("SPAWNED", false);
if (player0 != null)
{
npc0.getVariables().set("SPAWNED", false);
if (player0 != null)
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.RECORDER_CRUSHED);
if (verifyMemoState(player0, ART_OF_PERSUASION_ID, -1))
{
broadcastNpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.RECORDER_CRUSHED);
if (verifyMemoState(player0, ART_OF_PERSUASION_ID, -1))
{
setMemoState(player0, ART_OF_PERSUASION_ID, 5);
}
else if (verifyMemoState(player0, NIKOLAS_COOPERATION_ID, -1))
{
setMemoState(player0, NIKOLAS_COOPERATION_ID, 5);
}
setMemoState(player0, ART_OF_PERSUASION_ID, 5);
}
else if (verifyMemoState(player0, NIKOLAS_COOPERATION_ID, -1))
{
setMemoState(player0, NIKOLAS_COOPERATION_ID, 5);
}
}
}
@@ -166,8 +163,7 @@ final class Alarm extends AbstractNpcAI
{
if (verifyMemoState(player, ART_OF_PERSUASION_ID, 3))
{
final int i0 = getMemoStateEx(player, ART_OF_PERSUASION_ID, 1);
if (i0 >= 3)
if (getMemoStateEx(player, ART_OF_PERSUASION_ID, 1) >= 3)
{
if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED"))
{
@@ -185,14 +181,12 @@ final class Alarm extends AbstractNpcAI
}
else if (verifyMemoState(player, NIKOLAS_COOPERATION_ID, 3))
{
final int i0 = getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1);
if (i0 >= 3)
if (getMemoStateEx(player, NIKOLAS_COOPERATION_ID, 1) >= 3)
{
if ((npc0 != null) && npc0.getVariables().getBoolean("SPAWNED"))
{
npc0.getVariables().set("SPAWNED", false);
}
npc.deleteMe();
setMemoState(player, NIKOLAS_COOPERATION_ID, 4);
htmltext = "32367-185_09.html";
@@ -215,8 +209,7 @@ final class Alarm extends AbstractNpcAI
String htmltext = getNoQuestMsg(talker);
if (verifyMemoState(talker, ART_OF_PERSUASION_ID, 3) || verifyMemoState(talker, NIKOLAS_COOPERATION_ID, 3))
{
final L2PcInstance player = npc.getVariables().getObject("player0", L2PcInstance.class);
if (player == talker)
if (npc.getVariables().getObject("player0", L2PcInstance.class) == talker)
{
htmltext = "32367-01.html";
}

7
trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java vendored
View File

@@ -68,13 +68,10 @@ final class BlackJudge extends AbstractNpcAI
{
if (player.getShilensBreathDebuffLevel() > 0)
{
final int cost = COSTS[level];
if (player.getAdena() >= cost)
if (player.getAdena() >= COSTS[level])
{
takeItems(player, Inventory.ADENA_ID, cost);
takeItems(player, Inventory.ADENA_ID, COSTS[level]);
final int nextLv = player.getShilensBreathDebuffLevel() - 1;
if (nextLv > 0)
{
final Skill skill = SkillData.getInstance().getSkill(CommonSkill.SHILENS_BREATH.getId(), nextLv);

13
trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java vendored
View File

@@ -377,8 +377,7 @@ final class CastleChamberlain extends AbstractNpcAI
final List<Integer> fortList = FORTRESS.get(castleId);
for (int i = 0; i < numFort; i++)
{
final Fort fortress = FortManager.getInstance().getFortById(fortList.get(i));
if (fortress.getFortState() == 2)
if (FortManager.getInstance().getFortById(fortList.get(i)).getFortState() == 2)
{
return true;
}
@@ -989,12 +988,9 @@ final class CastleChamberlain extends AbstractNpcAI
{
final int locId = Integer.parseInt(st.nextToken());
final L2TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(locId);
if (list != null)
if ((list != null) && takeItems(player, list.getItemId(), list.getPrice()))
{
if (takeItems(player, list.getItemId(), list.getPrice()))
{
player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
}
player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
}
}
else
@@ -1118,10 +1114,9 @@ final class CastleChamberlain extends AbstractNpcAI
htmltext = "chamberlain-08.html";
break;
}
else if (npc.isMyLord(player))
if (npc.isMyLord(player))
{
final int cloakId = npc.getCastle().getSide() == CastleSide.DARK ? LORD_CLOAK_OF_DARK : LORD_CLOAK_OF_LIGHT;
if (hasQuestItems(player, cloakId))
{
htmltext = "chamberlain-03.html";

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

@@ -69,7 +69,7 @@ final class CastleTeleporter extends AbstractNpcAI
}
return event;
}
else if (event.equalsIgnoreCase("teleport"))
if (event.equalsIgnoreCase("teleport"))
{
final int region = MapRegionManager.getInstance().getMapRegionLocId(npc.getX(), npc.getY());
final NpcSay msg = new NpcSay(npc, ChatType.NPC_SHOUT, NpcStringId.THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE);

3
trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java vendored
View File

@@ -63,8 +63,7 @@ final class FortressArcherCaptain extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
return ((player.getClan() != null) && (player.getClanId() == fortOwner)) ? "FortressArcherCaptain.html" : "FortressArcherCaptain-01.html";
return ((player.getClan() != null) && (player.getClanId() == (npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId()))) ? "FortressArcherCaptain.html" : "FortressArcherCaptain-01.html";
}
public static void main(String[] args)

70
trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java vendored
View File

@@ -124,9 +124,7 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader
{
if ("mentee".equalsIgnoreCase(d.getNodeName()))
{
final int level = parseInteger(d.getAttributes(), "level");
final int coins = parseInteger(d.getAttributes(), "coins");
MENTEE_COINS.put(level, coins);
MENTEE_COINS.put(parseInteger(d.getAttributes(), "level"), parseInteger(d.getAttributes(), "coins"));
}
}
}
@@ -164,8 +162,7 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader
final String[] params = event.split(" ");
if (Util.isDigit(params[1]))
{
final int objectId = Integer.valueOf(params[1]);
MentorManager.getInstance().getMentees(objectId).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee ->
MentorManager.getInstance().getMentees(Integer.valueOf(params[1])).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee ->
{
MentorManager.getInstance().cancelMentoringBuffs(mentee.getPlayerInstance());
mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance()));
@@ -216,9 +213,9 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader
{
final L2PcInstance player = event.getMentee();
final L2Mentee mentor = MentorManager.getInstance().getMentor(player.getObjectId());
if (event.isMenteeOnline())
{
final L2Mentee mentor = MentorManager.getInstance().getMentor(player.getObjectId());
if ((mentor != null) && mentor.isOnline())
{
//@formatter:off
@@ -246,25 +243,19 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader
// Add the mentee skill
handleMenteeSkills(player);
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player));
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
player.sendPacket(new ExMentorList(player));
}
else
else if ((mentor != null) && mentor.isOnline())
{
final L2Mentee mentor = MentorManager.getInstance().getMentor(player.getObjectId());
if ((mentor != null) && mentor.isOnline())
if (MentorManager.getInstance().isAllMenteesOffline(mentor.getObjectId(), player.getObjectId()))
{
if (MentorManager.getInstance().isAllMenteesOffline(mentor.getObjectId(), player.getObjectId()))
{
MentorManager.getInstance().cancelMentoringBuffs(mentor.getPlayerInstance());
}
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player));
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
MentorManager.getInstance().cancelMentoringBuffs(mentor.getPlayerInstance());
}
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player));
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
}
@@ -461,32 +452,29 @@ public final class MentorGuide extends AbstractNpcAI implements IXmlReader
{
MentorManager.getInstance().cancelMentoringBuffs(player);
final L2Mentee mentor = MentorManager.getInstance().getMentor(player.getObjectId());
if (mentor != null)
if (mentor == null)
{
MentorManager.getInstance().setPenalty(mentor.getObjectId(), Config.MENTOR_PENALTY_FOR_MENTEE_COMPLETE);
MentorManager.getInstance().deleteMentor(mentor.getObjectId(), player.getObjectId());
if (mentor.isOnline())
{
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_AWAKENED_AND_THE_MENTOR_MENTEE_RELATIONSHIP_HAS_ENDED_THE_MENTOR_CANNOT_OBTAIN_ANOTHER_MENTEE_FOR_ONE_DAY_AFTER_THE_MENTEE_S_GRADUATION).addPcName(player));
if (MentorManager.getInstance().isAllMenteesOffline(mentor.getObjectId(), player.getObjectId()))
{
MentorManager.getInstance().cancelMentoringBuffs(mentor.getPlayerInstance());
}
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
// Remove the mentee skills
player.removeSkill(MENTEE_MENTOR_SUMMON.getSkill(), true);
// Clear mentee status
player.sendPacket(new ExMentorList(player));
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
return;
}
MentorManager.getInstance().setPenalty(mentor.getObjectId(), Config.MENTOR_PENALTY_FOR_MENTEE_COMPLETE);
MentorManager.getInstance().deleteMentor(mentor.getObjectId(), player.getObjectId());
if (mentor.isOnline())
{
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_AWAKENED_AND_THE_MENTOR_MENTEE_RELATIONSHIP_HAS_ENDED_THE_MENTOR_CANNOT_OBTAIN_ANOTHER_MENTEE_FOR_ONE_DAY_AFTER_THE_MENTEE_S_GRADUATION).addPcName(player));
if (MentorManager.getInstance().isAllMenteesOffline(mentor.getObjectId(), player.getObjectId()))
{
MentorManager.getInstance().cancelMentoringBuffs(mentor.getPlayerInstance());
}
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
// Remove the mentee skills
player.removeSkill(MENTEE_MENTOR_SUMMON.getSkill(), true);
// Clear mentee status
player.sendPacket(new ExMentorList(player));
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_MENTEE_RELATIONSHIP_WITH_YOUR_MENTOR_S1_HAS_ENDED_AS_YOU_ARE_AN_AWAKENED_CHARACTER_OF_LV_85_OR_ABOVE_YOU_CAN_NO_LONGER_BE_PAIRED_WITH_A_MENTOR).addPcName(player));
sendMail(player, MENTEE_GRADUATE_TITLE, MENTEE_GRADUATE_BODY, MENTEE_CERT, 1);
}
/**

5
trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java vendored
View File

@@ -81,7 +81,7 @@ final class Minigame extends AbstractNpcAI
{
return "32758-05.html";
}
else if ((npc.getTarget() != null) && (npc.getTarget() != player))
if ((npc.getTarget() != null) && (npc.getTarget() != player))
{
return "32758-04.html";
}
@@ -261,8 +261,7 @@ final class Minigame extends AbstractNpcAI
public void onSkillUse(OnCreatureSkillUse event)
{
final MinigameRoom room = getRoomByParticipant((L2PcInstance) event.getCaster());
final boolean miniGameStarted = room.getStarted();
if (miniGameStarted && (event.getSkill().getId() == SKILL_TORCH_LIGHT))
if (room.getStarted() && (event.getSkill().getId() == SKILL_TORCH_LIGHT))
{
for (L2Object obj : event.getTargets())
{

10
trunk/dist/game/data/scripts/ai/npc/Raina/Raina.java vendored
View File

@@ -423,9 +423,7 @@ public final class Raina extends AbstractNpcAI
{
final L2PcInstance player = event.getTalker();
final L2Npc npc = event.getNpc();
final int ask = event.getAsk();
switch (ask)
switch (event.getAsk())
{
case 0: // Add subclass confirm menu
{
@@ -658,9 +656,7 @@ public final class Raina extends AbstractNpcAI
for (SubClass subList : player.getSubClasses().values())
{
final ClassId subId = ClassId.getClassId(subList.getClassId());
if (subId.equalsOrChildOf(cid))
if (ClassId.getClassId(subList.getClassId()).equalsOrChildOf(cid))
{
availSubs.remove(cid);
break;
@@ -674,7 +670,7 @@ public final class Raina extends AbstractNpcAI
private boolean haveDoneQuest(L2PcInstance player)
{
final QuestState qs = player.getQuestState("Q10385_RedThreadOfFate"); // TODO: Replace with class name
return qs == null ? false : qs.isCompleted();
return (qs != null) && qs.isCompleted();
}
/**

3
trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java vendored
View File

@@ -272,8 +272,7 @@ final class SupportUnitCaptain extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final int fortOwner = npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId();
return ((player.getClan() != null) && (player.getClanId() == fortOwner)) ? "unitcaptain.html" : "unitcaptain-04.html";
return ((player.getClan() != null) && (player.getClanId() == (npc.getFort().getOwnerClan() == null ? 0 : npc.getFort().getOwnerClan().getId()))) ? "unitcaptain.html" : "unitcaptain-04.html";
}
public static void main(String[] args)

3
trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java vendored
View File

@@ -55,8 +55,7 @@ final class MithrilMinesTeleporter extends AbstractNpcAI
final int index = Integer.parseInt(event) - 1;
if (LOCS.length > index)
{
final Location loc = LOCS[index];
player.teleToLocation(loc, false);
player.teleToLocation(LOCS[index], false);
}
return super.onAdvEvent(event, npc, player);
}

3
trunk/dist/game/data/scripts/ai/npc/Teleports/YeSagiraTeleporter/YeSagiraTeleporter.java vendored
View File

@@ -73,8 +73,7 @@ public final class YeSagiraTeleporter extends AbstractNpcAI
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerCreate(OnPlayerCreate event)
{
final L2PcInstance player = event.getActiveChar();
player.getVariables().set(MOVIE_VAR, true);
event.getActiveChar().getVariables().set(MOVIE_VAR, true);
}
public static void main(String[] args)

27
trunk/dist/game/data/scripts/ai/npc/Trandon/Trandon.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.annotations.RegisterType;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin;
import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerSubChange;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.variables.PlayerVariables;
import com.l2jmobius.gameserver.network.clientpackets.RequestAcquireSkill;
@@ -418,18 +417,18 @@ public final class Trandon extends AbstractNpcAI
{
final PlayerVariables vars = player.getVariables();
final String list = vars.getString(type, "");
if (!list.isEmpty())
if (list.isEmpty())
{
final String[] skills = list.split(";");
for (String skill : skills)
{
final String[] str = skill.split("-");
final Skill sk = SkillData.getInstance().getSkill(Integer.parseInt(str[0]), Integer.parseInt(str[1]));
player.removeSkill(sk);
}
vars.remove(type);
player.sendSkillList();
return;
}
final String[] skills = list.split(";");
for (String skill : skills)
{
final String[] str = skill.split("-");
player.removeSkill(SkillData.getInstance().getSkill(Integer.parseInt(str[0]), Integer.parseInt(str[1])));
}
vars.remove(type);
player.sendSkillList();
}
private final void giveSkills(L2PcInstance player, String type)
@@ -437,12 +436,10 @@ public final class Trandon extends AbstractNpcAI
final String list = player.getVariables().getString(type, "");
if (!list.isEmpty())
{
final String[] skills = list.split(";");
for (String skill : skills)
for (String skill : list.split(";"))
{
final String[] str = skill.split("-");
final Skill sk = SkillData.getInstance().getSkill(Integer.parseInt(str[0]), Integer.parseInt(str[1]));
player.addSkill(sk, false);
player.addSkill(SkillData.getInstance().getSkill(Integer.parseInt(str[0]), Integer.parseInt(str[1])), false);
}
}
}

6
trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java vendored
View File

@@ -69,11 +69,7 @@ final class Zenya extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
if (player.getLevel() < MIN_LEVEL)
{
return "32140-3.html";
}
return "32140.html";
return player.getLevel() < MIN_LEVEL ? "32140-3.html" : "32140.html";
}
public static void main(String[] args)

4
trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java vendored
View File

@@ -84,9 +84,7 @@ final class DevastatedCastle extends ClanHallSiegeEngine
final int id = clan.getId();
if (_damageToGustav.containsKey(id))
{
int newDamage = _damageToGustav.get(id);
newDamage += damage;
_damageToGustav.put(id, newDamage);
_damageToGustav.put(id, (_damageToGustav.get(id) + damage));
}
else
{

3
trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java vendored
View File

@@ -117,8 +117,7 @@ final class FortressOfResistance extends ClanHallSiegeEngine
final int clanId = player.getClanId();
if (clanId > 0)
{
final long clanDmg = (_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage;
_damageToNurka.put(clanId, clanDmg);
_damageToNurka.put(clanId, ((_damageToNurka.containsKey(clanId)) ? _damageToNurka.get(clanId) + damage : damage));
}
return null;
}

7
trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java vendored
View File

@@ -91,9 +91,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine
final int id = clan.getId();
if ((id > 0) && _damageToLidia.containsKey(id))
{
int newDamage = _damageToLidia.get(id);
newDamage += damage;
_damageToLidia.put(id, newDamage);
_damageToLidia.put(id, (_damageToLidia.get(id) + damage));
}
else
{
@@ -158,8 +156,7 @@ final class FortressOfTheDead extends ClanHallSiegeEngine
if ((hoursLeft < 0) || (hoursLeft > 6))
{
cancelSiegeTask();
final long scheduleTime = (24 - hoursLeft) * 10 * 60000;
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), scheduleTime);
_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), ((24 - hoursLeft) * 10 * 60000));
}
else
{

160
trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java vendored
View File

@@ -22,7 +22,6 @@ import java.sql.ResultSet;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -75,57 +74,59 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
int spotLeft = 4;
if (_rainbow.getOwnerId() > 0)
if (_rainbow.getOwnerId() <= 0)
{
final L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
if (owner != null)
return;
}
final L2Clan owner = ClanTable.getInstance().getClan(_rainbow.getOwnerId());
if (owner != null)
{
_rainbow.free();
owner.setHideoutId(0);
_acceptedClans.add(owner);
--spotLeft;
}
for (int i = 0; i < spotLeft; i++)
{
long counter = 0;
L2Clan clan = null;
for (int clanId : _warDecreesCount.keySet())
{
_rainbow.free();
owner.setHideoutId(0);
_acceptedClans.add(owner);
--spotLeft;
}
for (int i = 0; i < spotLeft; i++)
{
long counter = 0;
L2Clan clan = null;
for (int clanId : _warDecreesCount.keySet())
final L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
final L2Clan actingClan = ClanTable.getInstance().getClan(clanId);
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
_warDecreesCount.remove(clanId);
continue;
}
final long count = _warDecreesCount.get(clanId);
if (count > counter)
{
counter = count;
clan = actingClan;
}
_warDecreesCount.remove(clanId);
continue;
}
if ((clan != null) && (_acceptedClans.size() < 4))
final long count = _warDecreesCount.get(clanId);
if (count > counter)
{
_acceptedClans.add(clan);
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if (leader != null)
{
leader.sendMessage("Your clan has been accepted to join the RainBow Srpings Chateau siege!");
}
counter = count;
clan = actingClan;
}
}
if (_acceptedClans.size() >= 2)
if ((clan != null) && (_acceptedClans.size() < 4))
{
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStart(), 3600000);
_rainbow.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
}
else
{
Broadcast.toAllOnlinePlayers("Rainbow Springs Chateau siege aborted due lack of population");
_acceptedClans.add(clan);
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if (leader != null)
{
leader.sendMessage("Your clan has been accepted to join the RainBow Srpings Chateau siege!");
}
}
}
if (_acceptedClans.size() >= 2)
{
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStart(), 3600000);
_rainbow.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
}
else
{
Broadcast.toAllOnlinePlayers("Rainbow Springs Chateau siege aborted due lack of population");
}
}
}
@@ -194,8 +195,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
for (int arenaId : ARENA_ZONES)
{
final Collection<L2Character> chars = ZoneManager.getInstance().getZoneById(arenaId).getCharactersInside();
for (L2Character chr : chars)
for (L2Character chr : ZoneManager.getInstance().getZoneById(arenaId).getCharactersInside())
{
if (chr != null)
{
@@ -285,18 +285,20 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
loadAttackers();
_rainbow = CHSiegeManager.getInstance().getSiegableHall(RAINBOW_SPRINGS);
if (_rainbow != null)
if (_rainbow == null)
{
final long delay = _rainbow.getNextSiegeTime();
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), delay);
}
else
{
_log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
}
return;
}
final long delay = _rainbow.getNextSiegeTime();
if (delay > -1)
{
setRegistrationEndString(delay - 3600000);
_nextSiege = ThreadPoolManager.getInstance().scheduleGeneral(new SetFinalAttackers(), delay);
}
else
{
_log.warning("CHSiegeManager: No Date setted for RainBow Springs Chateau Clan hall siege!. SIEGE CANCELED!");
}
}
@@ -317,35 +319,20 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
else if (npcId == CARETAKER)
{
if (_rainbow.isInSiege())
html = _rainbow.isInSiege() ? "game_manager003.htm" : "game_manager001.htm";
}
else if (Util.contains(YETIS, npcId) && _rainbow.isInSiege())
{
if (!player.isClanLeader())
{
html = "game_manager003.htm";
html = "no_clan_leader.htm";
}
else
{
html = "game_manager001.htm";
}
}
else if (Util.contains(YETIS, npcId))
{
// TODO: Review.
if (_rainbow.isInSiege())
{
if (!player.isClanLeader())
final L2Clan clan = player.getClan();
if (_acceptedClans.contains(clan) && (npcId == YETIS[_acceptedClans.indexOf(clan)]))
{
html = "no_clan_leader.htm";
}
else
{
final L2Clan clan = player.getClan();
if (_acceptedClans.contains(clan))
{
final int index = _acceptedClans.indexOf(clan);
if (npcId == YETIS[index])
{
html = "yeti_main.htm";
}
}
html = "yeti_main.htm";
}
}
}
@@ -769,8 +756,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static void reduceGourdHp(int index, L2PcInstance player)
{
final L2Spawn gourd = _gourds[index];
gourd.getLastSpawn().reduceCurrentHp(1000, player, null);
_gourds[index].getLastSpawn().reduceCurrentHp(1000, player, null);
}
private static void increaseGourdHp(int index)
@@ -789,8 +775,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
continue;
}
final Collection<L2Character> chars = ZoneManager.getInstance().getZoneById(id).getCharactersInside();
for (L2Character chr : chars)
for (L2Character chr : ZoneManager.getInstance().getZoneById(id).getCharactersInside())
{
if (chr != null)
{
@@ -813,17 +798,14 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
final int randomPos = getRandom(length);
final String message = _textPassages[randomPos];
if (_usedTextPassages.containsKey(message))
if (_usedTextPassages.containsKey(_textPassages[randomPos]))
{
shoutRandomText(npc);
}
else
{
_usedTextPassages.put(message, new ArrayList<L2Clan>());
final NpcSay say = new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), message);
npc.broadcastPacket(say);
_usedTextPassages.put(_textPassages[randomPos], new ArrayList<L2Clan>());
npc.broadcastPacket((new NpcSay(npc.getObjectId(), ChatType.NPC_SHOUT, npc.getId(), _textPassages[randomPos])));
}
}

3
trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java vendored
View File

@@ -177,8 +177,7 @@ final class Wedding extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
final String htmltext = getHtm(player.getHtmlPrefix(), "Start.html");
return htmltext.replaceAll("%fee%", String.valueOf(Config.L2JMOD_WEDDING_PRICE));
return getHtm(player.getHtmlPrefix(), "Start.html").replaceAll("%fee%", String.valueOf(Config.L2JMOD_WEDDING_PRICE));
}
private String sendHtml(L2PcInstance player, String fileName, String regex, String replacement)

3
trunk/dist/game/data/scripts/custom/listeners/ListenerTest.java vendored
View File

@@ -139,8 +139,7 @@ public class ListenerTest extends AbstractNpcAI
// Make sure a player killed this monster.
if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable())
{
final L2Attackable monster = (L2Attackable) event.getTarget();
monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000)));
((L2Attackable) event.getTarget()).dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000)));
}
}

37
trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java vendored
View File

@@ -56,30 +56,27 @@ final class LoveYourGatekeeper extends LongTimeEvent
{
case "transform_stick":
{
if (player.getAdena() >= PRICE)
if (player.getAdena() < PRICE)
{
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
{
final long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
sm.addItemName(GATEKEEPER_TRANSFORMATION_STICK);
sm.addInt(hours);
sm.addInt(minutes);
player.sendPacket(sm);
}
else
{
takeItems(player, Inventory.ADENA_ID, PRICE);
giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1);
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
}
return "32477-3.htm";
}
final long reuse = player.getVariables().getLong(REUSE, 0);
if (reuse > System.currentTimeMillis())
{
final long remainingTime = (reuse - System.currentTimeMillis()) / 1000;
final int hours = (int) (remainingTime / 3600);
final int minutes = (int) ((remainingTime % 3600) / 60);
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WILL_BE_AVAILABLE_FOR_RE_USE_AFTER_S2_HOUR_S_S3_MINUTE_S);
sm.addItemName(GATEKEEPER_TRANSFORMATION_STICK);
sm.addInt(hours);
sm.addInt(minutes);
player.sendPacket(sm);
}
else
{
return "32477-3.htm";
takeItems(player, Inventory.ADENA_ID, PRICE);
giveItems(player, GATEKEEPER_TRANSFORMATION_STICK, 1);
player.getVariables().set(REUSE, System.currentTimeMillis() + (HOURS * 3600000));
}
return null;
}

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

@@ -735,9 +735,7 @@ public class EnergySeeds extends AbstractNpcAI
// if the AI is inactive, do not spawn the NPC
if (isSeedActive(_seedId))
{
// get a random NPC that should spawn at this location
final Integer spawnId = _spawnId; // the map uses "Integer", not "int"
_spawnedNpcs.put(addSpawn(_npcIds[getRandom(_npcIds.length)], _loc, false, 0), spawnId);
_spawnedNpcs.put(addSpawn(_npcIds[getRandom(_npcIds.length)], _loc, false, 0), _spawnId);
}
}, waitTime);
}

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

@@ -110,8 +110,7 @@ public class Lindvior extends AbstractNpcAI
private void scheduleNextLindviorVisit()
{
final long delay = (ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate();
startQuestTimer("start", delay, null, null);
startQuestTimer("start", ((ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate()), null, null);
}
private long scheduleNextLindviorDate()

163
trunk/dist/game/data/scripts/gracia/AI/Maguen.java vendored
View File

@@ -260,103 +260,100 @@ public final class Maguen extends AbstractNpcAI
@Override
public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
{
if ((skill == MACHINE.getSkill()) && (caster == npc.getVariables().getObject("SUMMON_PLAYER", L2PcInstance.class)))
if ((skill == MACHINE.getSkill()) && (caster == npc.getVariables().getObject("SUMMON_PLAYER", L2PcInstance.class)) && (npc.getVariables().getInt("NPC_EFFECT") != 0) && (npc.getVariables().getInt("BLOCKED_SKILLSEE") == 0))
{
if ((npc.getVariables().getInt("NPC_EFFECT") != 0) && (npc.getVariables().getInt("BLOCKED_SKILLSEE") == 0))
final BuffInfo i1_info = caster.getEffectList().getBuffInfoByAbnormalType(B_PLASMA1.getSkill().getAbnormalType());
final BuffInfo i2_info = caster.getEffectList().getBuffInfoByAbnormalType(C_PLASMA1.getSkill().getAbnormalType());
final BuffInfo i3_info = caster.getEffectList().getBuffInfoByAbnormalType(R_PLASMA1.getSkill().getAbnormalType());
final int i1 = i1_info == null ? 0 : i1_info.getSkill().getAbnormalLvl();
final int i2 = i2_info == null ? 0 : i2_info.getSkill().getAbnormalLvl();
final int i3 = i3_info == null ? 0 : i3_info.getSkill().getAbnormalLvl();
caster.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
cancelQuestTimer("FIRST_TIMER", npc, caster);
cancelQuestTimer("SECOND_TIMER", npc, caster);
cancelQuestTimer("THIRD_TIMER", npc, caster);
cancelQuestTimer("FORTH_TIMER", npc, caster);
npc.getVariables().set("BLOCKED_SKILLSEE", 1);
SkillHolder skillToCast = null;
switch (npc.getVariables().getInt("NPC_EFFECT"))
{
final BuffInfo i1_info = caster.getEffectList().getBuffInfoByAbnormalType(B_PLASMA1.getSkill().getAbnormalType());
final BuffInfo i2_info = caster.getEffectList().getBuffInfoByAbnormalType(C_PLASMA1.getSkill().getAbnormalType());
final BuffInfo i3_info = caster.getEffectList().getBuffInfoByAbnormalType(R_PLASMA1.getSkill().getAbnormalType());
final int i1 = i1_info == null ? 0 : i1_info.getSkill().getAbnormalLvl();
final int i2 = i2_info == null ? 0 : i2_info.getSkill().getAbnormalLvl();
final int i3 = i3_info == null ? 0 : i3_info.getSkill().getAbnormalLvl();
caster.getEffectList().stopSkillEffects(true, B_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, C_PLASMA1.getSkill().getAbnormalType());
caster.getEffectList().stopSkillEffects(true, R_PLASMA1.getSkill().getAbnormalType());
cancelQuestTimer("FIRST_TIMER", npc, caster);
cancelQuestTimer("SECOND_TIMER", npc, caster);
cancelQuestTimer("THIRD_TIMER", npc, caster);
cancelQuestTimer("FORTH_TIMER", npc, caster);
npc.getVariables().set("BLOCKED_SKILLSEE", 1);
SkillHolder skillToCast = null;
switch (npc.getVariables().getInt("NPC_EFFECT"))
case 1:
{
case 1:
switch (i1)
{
switch (i1)
case 0:
{
case 0:
{
skillToCast = B_PLASMA1;
break;
}
case 1:
{
skillToCast = B_PLASMA2;
break;
}
case 2:
{
skillToCast = B_PLASMA3;
break;
}
skillToCast = B_PLASMA1;
break;
}
break;
}
case 2:
{
switch (i2)
case 1:
{
case 0:
{
skillToCast = C_PLASMA1;
break;
}
case 1:
{
skillToCast = C_PLASMA2;
break;
}
case 2:
{
skillToCast = C_PLASMA3;
break;
}
skillToCast = B_PLASMA2;
break;
}
break;
}
case 3:
{
switch (i3)
case 2:
{
case 0:
{
skillToCast = R_PLASMA1;
break;
}
case 1:
{
skillToCast = R_PLASMA2;
break;
}
case 2:
{
skillToCast = R_PLASMA3;
break;
}
skillToCast = B_PLASMA3;
break;
}
break;
}
break;
}
if (skillToCast != null)
case 2:
{
npc.setTarget(caster);
npc.doCast(skillToCast.getSkill());
switch (i2)
{
case 0:
{
skillToCast = C_PLASMA1;
break;
}
case 1:
{
skillToCast = C_PLASMA2;
break;
}
case 2:
{
skillToCast = C_PLASMA3;
break;
}
}
break;
}
case 3:
{
switch (i3)
{
case 0:
{
skillToCast = R_PLASMA1;
break;
}
case 1:
{
skillToCast = R_PLASMA2;
break;
}
case 2:
{
skillToCast = R_PLASMA3;
break;
}
}
break;
}
}
if (skillToCast != null)
{
npc.setTarget(caster);
npc.doCast(skillToCast.getSkill());
}
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);

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

@@ -339,8 +339,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
{
if (TELEPORT_ZONES.containsKey(zone.getId()))
{
final Location teleLoc = TELEPORT_ZONES.get(zone.getId());
character.teleToLocation(teleLoc, false);
character.teleToLocation(TELEPORT_ZONES.get(zone.getId()), false);
}
return super.onEnterZone(character, zone);
}

2
trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java vendored
View File

@@ -86,7 +86,7 @@ public final class SecretArea extends Quest
enterInstance(player);
return "32566-01.html";
}
else if ((npc.getId() == LELRIKIA) && event.equalsIgnoreCase("exit"))
if ((npc.getId() == LELRIKIA) && event.equalsIgnoreCase("exit"))
{
teleportPlayer(player, TELEPORTS[EXIT], 0);
return "32567-01.html";

101
trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java vendored
View File

@@ -298,43 +298,30 @@ public final class Stage1 extends Quest
attrs = cd.getAttributes();
final SODSpawn spw = new SODSpawn();
spw.npcId = npcId;
att = attrs.getNamedItem("x");
if (att != null)
{
spw.x = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.x = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("y");
if (att != null)
{
spw.y = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.y = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("z");
if (att != null)
{
spw.z = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.z = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("heading");
if (att != null)
{
spw.h = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.h = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("mustKill");
if (att != null)
{
@@ -353,25 +340,18 @@ public final class Stage1 extends Quest
final SODSpawn spw = new SODSpawn();
spw.npcId = npcId;
spw.isZone = true;
att = attrs.getNamedItem("id");
if (att != null)
{
spw.zone = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.zone = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("count");
if (att != null)
{
spw.count = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
spw.count = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("mustKill");
if (att != null)
{
@@ -425,24 +405,17 @@ public final class Stage1 extends Quest
attrs = cd.getAttributes();
int x, y;
att = attrs.getNamedItem("x");
if (att != null)
{
x = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
x = Integer.parseInt(att.getNodeValue());
att = attrs.getNamedItem("y");
if (att != null)
{
y = Integer.parseInt(att.getNodeValue());
}
else
if (att == null)
{
continue;
}
y = Integer.parseInt(att.getNodeValue());
ter.add(x, y, minz, maxz, 0);
}
}
@@ -505,8 +478,7 @@ public final class Stage1 extends Quest
party.broadcastPacket(sm);
return false;
}
final Long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID);
if (System.currentTimeMillis() < reentertime)
if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), INSTANCEID))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -834,24 +806,17 @@ public final class Stage1 extends Quest
if (!isSummon && (player != null))
{
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId());
if (tmpworld instanceof SOD1World)
if ((tmpworld instanceof SOD1World) && (((SOD1World) tmpworld).getStatus() == 7) && spawnState(((SOD1World) tmpworld)))
{
final SOD1World world = (SOD1World) tmpworld;
if (world.getStatus() == 7)
for (int objId : ((SOD1World) tmpworld).getAllowed())
{
if (spawnState(world))
final L2PcInstance pl = L2World.getInstance().getPlayer(objId);
if (pl != null)
{
for (int objId : world.getAllowed())
{
final L2PcInstance pl = L2World.getInstance().getPlayer(objId);
if (pl != null)
{
pl.showQuestMovie(5);
}
}
npc.deleteMe();
pl.showQuestMovie(5);
}
}
npc.deleteMe();
}
}
return null;
@@ -874,16 +839,10 @@ public final class Stage1 extends Quest
world.setStatus(4);
spawnFlaggedNPCs(world, 2);
}
else if ((world.getStatus() <= 8) && (npc.getId() == TIAT))
else if ((world.getStatus() <= 8) && (npc.getId() == TIAT) && (npc.getCurrentHp() < (npc.getMaxHp() / 2)) && spawnState(world))
{
if (npc.getCurrentHp() < (npc.getMaxHp() / 2))
{
if (spawnState(world))
{
startQuestTimer("TiatFullHp", 3000, npc, null);
setInstanceTimeRestrictions(world);
}
}
startQuestTimer("TiatFullHp", 3000, npc, null);
setInstanceTimeRestrictions(world);
}
}
return null;
@@ -922,8 +881,7 @@ public final class Stage1 extends Quest
{
world.deviceSpawnedMobCount = 0;
spawnFlaggedNPCs(world, 6);
final ExShowScreenMessage message3 = new ExShowScreenMessage(NpcStringId.ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS, 5, 1);
sendScreenMessage(world, message3);
sendScreenMessage(world, new ExShowScreenMessage(NpcStringId.ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS, 5, 1));
}
else
{
@@ -1061,7 +1019,6 @@ public final class Stage1 extends Quest
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(trap.getInstanceId());
if (tmpworld instanceof SOD1World)
{
final SOD1World world = (SOD1World) tmpworld;
switch (action)
{
case TRAP_TRIGGERED:
@@ -1070,14 +1027,14 @@ public final class Stage1 extends Quest
{
for (int npcId : TRAP_18771_NPCS)
{
addSpawn(npcId, trap.getX(), trap.getY(), trap.getZ(), trap.getHeading(), true, 0, true, world.getInstanceId());
addSpawn(npcId, trap.getX(), trap.getY(), trap.getZ(), trap.getHeading(), true, 0, true, ((SOD1World) tmpworld).getInstanceId());
}
}
else
{
for (int npcId : TRAP_OTHER_NPCS)
{
addSpawn(npcId, trap.getX(), trap.getY(), trap.getZ(), trap.getHeading(), true, 0, true, world.getInstanceId());
addSpawn(npcId, trap.getX(), trap.getY(), trap.getZ(), trap.getHeading(), true, 0, true, ((SOD1World) tmpworld).getInstanceId());
}
}
break;

30
trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java vendored
View File

@@ -232,8 +232,7 @@ public final class HallOfSuffering extends AbstractNpcAI
party.broadcastPacket(sm);
return false;
}
final long reentertime = InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID);
if (System.currentTimeMillis() < reentertime)
if (System.currentTimeMillis() < InstanceManager.getInstance().getInstanceTime(partyMember.getObjectId(), TEMPLATE_ID))
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET);
sm.addPcName(partyMember);
@@ -457,9 +456,7 @@ public final class HallOfSuffering extends AbstractNpcAI
private String getPtLeaderText(L2PcInstance player, HSWorld world)
{
String htmltext = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/32530-10.htm");
htmltext = htmltext.replaceAll("%ptLeader%", String.valueOf(world.ptLeaderName));
return htmltext;
return HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/32530-10.htm").replaceAll("%ptLeader%", String.valueOf(world.ptLeaderName));
}
@Override
@@ -619,20 +616,17 @@ public final class HallOfSuffering extends AbstractNpcAI
runTwins(world);
}
}
else if ((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS)))
else if ((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS)) && world.klanikus.isDead() && world.klodekus.isDead())
{
if (world.klanikus.isDead() && world.klodekus.isDead())
{
world.incStatus();
// instance end
calcRewardItemId(world);
world.klanikus = null;
world.klodekus = null;
cancelQuestTimers("ressurectTwin");
cancelQuestTimers("spawnBossGuards");
cancelQuestTimers("isTwinSeparated");
addSpawn(TEPIOS, TEPIOS_SPAWN, false, 0, false, world.getInstanceId());
}
world.incStatus();
// instance end
calcRewardItemId(world);
world.klanikus = null;
world.klodekus = null;
cancelQuestTimers("ressurectTwin");
cancelQuestTimers("spawnBossGuards");
cancelQuestTimers("isTwinSeparated");
addSpawn(TEPIOS, TEPIOS_SPAWN, false, 0, false, world.getInstanceId());
}
}
return super.onKill(npc, killer, isSummon);

67
trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java vendored
View File

@@ -285,34 +285,31 @@ public abstract class AirShipController extends Quest
@Override
public String onEnterZone(L2Character character, L2ZoneType zone)
{
if (character instanceof L2ControllableAirShipInstance)
if ((character instanceof L2ControllableAirShipInstance) && (_dockedShip == null))
{
if (_dockedShip == null)
_dockedShip = (L2ControllableAirShipInstance) character;
_dockedShip.setInDock(_dockZone);
_dockedShip.setOustLoc(_oustLoc);
// Ship is not empty - display movie to passengers and dock
if (!_dockedShip.isEmpty())
{
_dockedShip = (L2ControllableAirShipInstance) character;
_dockedShip.setInDock(_dockZone);
_dockedShip.setOustLoc(_oustLoc);
// Ship is not empty - display movie to passengers and dock
if (!_dockedShip.isEmpty())
if (_movieId != 0)
{
if (_movieId != 0)
for (L2PcInstance passenger : _dockedShip.getPassengers())
{
for (L2PcInstance passenger : _dockedShip.getPassengers())
if (passenger != null)
{
if (passenger != null)
{
passenger.showQuestMovie(_movieId);
}
passenger.showQuestMovie(_movieId);
}
}
ThreadPoolManager.getInstance().scheduleGeneral(_decayTask, 1000);
}
else
{
_departSchedule = ThreadPoolManager.getInstance().scheduleGeneral(_departTask, DEPART_INTERVAL);
}
ThreadPoolManager.getInstance().scheduleGeneral(_decayTask, 1000);
}
else
{
_departSchedule = ThreadPoolManager.getInstance().scheduleGeneral(_departTask, DEPART_INTERVAL);
}
}
return null;
@@ -321,20 +318,17 @@ public abstract class AirShipController extends Quest
@Override
public String onExitZone(L2Character character, L2ZoneType zone)
{
if (character instanceof L2ControllableAirShipInstance)
if ((character instanceof L2ControllableAirShipInstance) && character.equals(_dockedShip))
{
if (character.equals(_dockedShip))
if (_departSchedule != null)
{
if (_departSchedule != null)
{
_departSchedule.cancel(false);
_departSchedule = null;
}
_dockedShip.setInDock(0);
_dockedShip = null;
_isBusy = false;
_departSchedule.cancel(false);
_departSchedule = null;
}
_dockedShip.setInDock(0);
_dockedShip = null;
_isBusy = false;
}
return null;
}
@@ -373,14 +367,11 @@ public abstract class AirShipController extends Quest
}
}
}
if (_arrivalPath == null)
if ((_arrivalPath == null) && !ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ))
{
if (!ZoneManager.getInstance().getZoneById(_dockZone, L2ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ))
{
_log.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled");
_isBusy = true;
return;
}
_log.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled");
_isBusy = true;
return;
}
if (_departPath != null)

11
trunk/dist/game/data/scripts/handlers/actionhandlers/L2ArtefactInstanceAction.java vendored
View File

@@ -50,14 +50,11 @@ public class L2ArtefactInstanceAction implements IActionHandler
{
activeChar.setTarget(target);
}
else if (interact)
// Calculate the distance between the L2PcInstance and the L2NpcInstance
else if (interact && !((L2Npc) target).canInteract(activeChar))
{
// Calculate the distance between the L2PcInstance and the L2NpcInstance
if (!((L2Npc) target).canInteract(activeChar))
{
// Notify the L2PcInstance AI with AI_INTENTION_INTERACT
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
}
// Notify the L2PcInstance AI with AI_INTENTION_INTERACT
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
}
return true;
}

4
trunk/dist/game/data/scripts/handlers/actionhandlers/L2NpcAction.java vendored
View File

@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.handler.IActionHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.L2Event;
@@ -88,8 +87,7 @@ public class L2NpcAction implements IActionHandler
}
else
{
final Location destination = GeoData.getInstance().moveCheck(activeChar, target);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, target));
}
}
else if (!target.isAutoAttackable(activeChar))

7
trunk/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java vendored
View File

@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.enums.InstanceType;
import com.l2jmobius.gameserver.enums.PrivateStoreType;
import com.l2jmobius.gameserver.handler.IActionHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.TvTEvent;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -108,8 +107,7 @@ public class L2PcInstanceAction implements IActionHandler
}
else
{
final Location destination = GeoData.getInstance().moveCheck(activeChar, player);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, player));
}
activeChar.onActionRequest();
}
@@ -124,8 +122,7 @@ public class L2PcInstanceAction implements IActionHandler
}
else
{
final Location destination = GeoData.getInstance().moveCheck(activeChar, player);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, GeoData.getInstance().moveCheck(activeChar, player));
}
}
}

2
trunk/dist/game/data/scripts/handlers/actionhandlers/L2StaticObjectInstanceAction.java vendored
View File

@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
public class L2StaticObjectInstanceAction implements IActionHandler
{
@Override
public boolean action(L2PcInstance activeChar, final L2Object target, final boolean interact)
public boolean action(L2PcInstance activeChar, L2Object target, boolean interact)
{
final L2StaticObjectInstance staticObject = (L2StaticObjectInstance) target;
if (staticObject.getType() < 0)

3
trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2ItemInstanceActionShift.java vendored
View File

@@ -31,8 +31,7 @@ public class L2ItemInstanceActionShift implements IActionShiftHandler
{
if (activeChar.getAccessLevel().isGm())
{
final NpcHtmlMessage html = new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
activeChar.sendPacket(html);
activeChar.sendPacket(new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Item Info</font></center><br><table border=0>", "<tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Item ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Owner ID: </td><td>", String.valueOf(((L2ItemInstance) target).getOwnerId()), "</td></tr><tr><td>Location: </td><td>", String.valueOf(((L2ItemInstance) target).getLocation()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>")));
}
return true;
}

4
trunk/dist/game/data/scripts/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java vendored
View File

@@ -34,9 +34,7 @@ public class L2StaticObjectInstanceActionShift implements IActionShiftHandler
{
activeChar.setTarget(target);
activeChar.sendPacket(new StaticObject((L2StaticObjectInstance) target));
final NpcHtmlMessage html = new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>"));
activeChar.sendPacket(html);
activeChar.sendPacket(new NpcHtmlMessage(StringUtil.concat("<html><body><center><font color=\"LEVEL\">Static Object Info</font></center><br><table border=0><tr><td>Coords X,Y,Z: </td><td>", String.valueOf(target.getX()), ", ", String.valueOf(target.getY()), ", ", String.valueOf(target.getZ()), "</td></tr><tr><td>Object ID: </td><td>", String.valueOf(target.getObjectId()), "</td></tr><tr><td>Static Object ID: </td><td>", String.valueOf(target.getId()), "</td></tr><tr><td>Mesh Index: </td><td>", String.valueOf(((L2StaticObjectInstance) target).getMeshIndex()), "</td></tr><tr><td><br></td></tr><tr><td>Class: </td><td>", target.getClass().getSimpleName(), "</td></tr></table></body></html>")));
}
return true;
}

11
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java vendored
View File

@@ -287,16 +287,11 @@ public class AdminAdmin implements IAdminCommandHandler
showConfigPage(activeChar);
}
}
else if (command.startsWith("admin_gmon"))
{
// nothing
}
else if (command.startsWith("admin_worldchat"))
{
final StringTokenizer st = new StringTokenizer(command);
st.nextToken(); // admin_worldchat
final String subCmd = st.hasMoreTokens() ? st.nextToken() : "";
switch (subCmd)
switch (st.hasMoreTokens() ? st.nextToken() : "")
{
case "shout":
{
@@ -372,6 +367,10 @@ public class AdminAdmin implements IAdminCommandHandler
}
}
}
else if (command.startsWith("admin_gmon"))
{
// nothing
}
return true;
}

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java vendored
View File

@@ -83,8 +83,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
}
case "admin_announces":
{
final String subCmd = st.hasMoreTokens() ? st.nextToken() : "";
switch (subCmd)
switch (st.hasMoreTokens() ? st.nextToken() : "")
{
case "add":
{

37
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -138,9 +138,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(22);
final int page = Integer.parseInt(val);
listCharacters(activeChar, page);
listCharacters(activeChar, Integer.parseInt(command.substring(22)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -152,8 +150,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(21);
findCharacter(activeChar, val);
findCharacter(activeChar, command.substring(21));
}
catch (StringIndexOutOfBoundsException e)
{ // Case of empty character name
@@ -165,8 +162,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(14);
findCharactersPerIp(activeChar, val);
findCharactersPerIp(activeChar, command.substring(14));
}
catch (Exception e)
{ // Case of empty or malformed IP number
@@ -178,8 +174,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
findCharactersPerAccount(activeChar, val);
findCharactersPerAccount(activeChar, command.substring(19));
}
catch (Exception e)
{ // Case of empty or malformed player name
@@ -212,9 +207,7 @@ public class AdminEditChar implements IAdminCommandHandler
{
try
{
final String val = command.substring(15);
final int karma = Integer.parseInt(val);
setTargetKarma(activeChar, karma);
setTargetKarma(activeChar, Integer.parseInt(command.substring(15)));
}
catch (Exception e)
{
@@ -570,9 +563,7 @@ public class AdminEditChar implements IAdminCommandHandler
final boolean changeCreateExpiryTime = st.nextToken().equalsIgnoreCase("create");
final String playerName = st.nextToken();
L2PcInstance player = null;
player = L2World.getInstance().getPlayer(playerName);
final L2PcInstance player = L2World.getInstance().getPlayer(playerName);
if (player == null)
{
final String updateQuery = "UPDATE characters SET " + (changeCreateExpiryTime ? "clan_create_expiry_time" : "clan_join_expiry_time") + " WHERE char_name=? LIMIT 1";
@@ -751,9 +742,7 @@ public class AdminEditChar implements IAdminCommandHandler
L2Object target;
try
{
final String val = command.substring(19);
final int objId = Integer.parseInt(val);
target = L2World.getInstance().getPet(objId);
target = L2World.getInstance().getPet(Integer.parseInt(command.substring(19)));
}
catch (Exception e)
{
@@ -888,8 +877,7 @@ public class AdminEditChar implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
final L2Playable playable = ((L2Playable) target);
playable.updatePvPFlag(Math.abs(playable.getPvpFlag() - 1));
((L2Playable) target).updatePvPFlag(Math.abs(((L2Playable) target).getPvpFlag() - 1));
}
catch (Exception e)
{
@@ -1079,8 +1067,7 @@ public class AdminEditChar implements IAdminCommandHandler
if (target instanceof L2PcInstance)
{
final L2PcInstance player = (L2PcInstance) target;
gatherCharacterInfo(activeChar, player, "charedit.htm");
gatherCharacterInfo(activeChar, ((L2PcInstance) target), "charedit.htm");
}
}
@@ -1378,8 +1365,7 @@ public class AdminEditChar implements IAdminCommandHandler
public int hashCode()
{
final int prime = 31;
int result = 1;
result = (prime * result) + ((ip == null) ? 0 : ip.hashCode());
int result = (prime * 1) + ((ip == null) ? 0 : ip.hashCode());
for (int[] array : tracert)
{
result = (prime * result) + Arrays.hashCode(array);
@@ -1455,8 +1441,7 @@ public class AdminEditChar implements IAdminCommandHandler
html.replace("%race%", target.getTemplate().getRace().toString());
if (target instanceof L2PetInstance)
{
final int objId = target.getActingPlayer().getObjectId();
html.replace("%inv%", " <a action=\"bypass admin_show_pet_inv " + objId + "\">view</a>");
html.replace("%inv%", " <a action=\"bypass admin_show_pet_inv " + target.getActingPlayer().getObjectId() + "\">view</a>");
}
else
{

37
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEffects.java vendored
View File

@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2ChestInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalVisualEffect;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.SystemMessageId;
import com.l2jmobius.gameserver.network.serverpackets.CharInfo;
import com.l2jmobius.gameserver.network.serverpackets.Earthquake;
@@ -227,8 +226,7 @@ public class AdminEffects implements IAdminCommandHandler
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
if (!player.isGM())
{
@@ -246,8 +244,7 @@ public class AdminEffects implements IAdminCommandHandler
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
player.stopAbnormalVisualEffect(AbnormalVisualEffect.PARALYZE);
player.setIsParalyzed(false);
@@ -363,8 +360,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.stopSkillEffects((val == 0) && sendMessage, 7029);
if ((val >= 1) && (val <= 4))
{
final Skill gmSpeedSkill = SkillData.getInstance().getSkill(7029, val);
activeChar.doSimultaneousCast(gmSpeedSkill);
activeChar.doSimultaneousCast(SkillData.getInstance().getSkill(7029, val));
}
}
catch (Exception e)
@@ -386,8 +382,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.teleToLocation(activeChar.getLocation());
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.sendPacket(new UserInfo(activeChar));
}
catch (Exception e)
{
@@ -401,15 +396,13 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
final CharInfo info1 = new CharInfo(activeChar);
activeChar.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(activeChar);
activeChar.sendPacket(info2);
activeChar.sendPacket(new UserInfo(activeChar));
}
else if (command.equals("admin_clearteams"))
{
try
{
final Collection<L2PcInstance> plrs = activeChar.getKnownList().getKnownPlayers().values();
for (L2PcInstance player : plrs)
for (L2PcInstance player : activeChar.getKnownList().getKnownPlayers().values())
{
player.setTeam(Team.NONE);
player.broadcastUserInfo();
@@ -430,9 +423,7 @@ public class AdminEffects implements IAdminCommandHandler
radius = Integer.parseInt(st.nextToken());
}
final Team team = Team.valueOf(val.toUpperCase());
final Collection<L2Character> plrs = activeChar.getKnownList().getKnownCharactersInRadius(radius);
for (L2Character player : plrs)
for (L2Character player : activeChar.getKnownList().getKnownCharactersInRadius(radius))
{
player.setTeam(team);
}
@@ -648,9 +639,7 @@ public class AdminEffects implements IAdminCommandHandler
final L2Npc npc = (L2Npc) target;
try
{
final String type = st.nextToken();
final int diplayeffect = Integer.parseInt(type);
npc.setDisplayEffect(diplayeffect);
npc.setDisplayEffect(Integer.parseInt(st.nextToken()));
}
catch (Exception e)
{
@@ -709,8 +698,7 @@ public class AdminEffects implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
return false;
}
final L2Character character = (L2Character) target;
character.broadcastPacket(new SocialAction(character.getObjectId(), action));
((L2Character) target).broadcastPacket(new SocialAction(((L2Character) target).getObjectId(), action));
}
else
{
@@ -781,11 +769,6 @@ public class AdminEffects implements IAdminCommandHandler
private void showMainPage(L2PcInstance activeChar, String command)
{
String filename = "effects_menu";
if (command.contains("social"))
{
filename = "social";
}
AdminHtml.showAdminHtml(activeChar, filename + ".htm");
AdminHtml.showAdminHtml(activeChar, (command.contains("social") ? "social" : "effects_menu") + ".htm");
}
}

6
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -321,8 +321,7 @@ public class AdminEventEngine implements IAdminCommandHandler
player.teleToLocation(player.getLocation(), true);
final CharInfo info1 = new CharInfo(player);
player.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.sendPacket(new UserInfo(player));
}
showEventControl(activeChar);
}
@@ -337,8 +336,7 @@ public class AdminEventEngine implements IAdminCommandHandler
player.spawnMe(player.getX(), player.getY(), player.getZ());
final CharInfo info1 = new CharInfo(player);
player.broadcastPacket(info1);
final UserInfo info2 = new UserInfo(player);
player.sendPacket(info2);
player.sendPacket(new UserInfo(player));
}
}
showEventControl(activeChar);

6
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminExpSp.java vendored
View File

@@ -52,8 +52,7 @@ public class AdminExpSp implements IAdminCommandHandler
{
try
{
final String val = command.substring(16);
if (!adminAddExpSp(activeChar, val))
if (!adminAddExpSp(activeChar, command.substring(16)))
{
activeChar.sendMessage("Usage: //add_exp_sp exp sp");
}
@@ -67,8 +66,7 @@ public class AdminExpSp implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
if (!adminRemoveExpSP(activeChar, val))
if (!adminRemoveExpSP(activeChar, command.substring(19)))
{
activeChar.sendMessage("Usage: //remove_exp_sp exp sp");
}

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFightCalculator.java vendored
View File

@@ -106,16 +106,8 @@ public class AdminFightCalculator implements IAdminCommandHandler
}
}
L2NpcTemplate npc1 = null;
if (mid1 != 0)
{
npc1 = NpcData.getInstance().getTemplate(mid1);
}
L2NpcTemplate npc2 = null;
if (mid2 != 0)
{
npc2 = NpcData.getInstance().getTemplate(mid2);
}
final L2NpcTemplate npc1 = mid1 != 0 ? NpcData.getInstance().getTemplate(mid1) : null;
final L2NpcTemplate npc2 = mid2 != 0 ? NpcData.getInstance().getTemplate(mid2) : null;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();

5
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminFortSiege.java vendored
View File

@@ -21,7 +21,6 @@ import java.util.StringTokenizer;
import com.l2jmobius.gameserver.handler.IAdminCommandHandler;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.entity.Fort;
@@ -124,8 +123,7 @@ public class AdminFortSiege implements IAdminCommandHandler
}
else if (command.equalsIgnoreCase("admin_removefort"))
{
final L2Clan clan = fort.getOwnerClan();
if (clan != null)
if (fort.getOwnerClan() != null)
{
fort.removeOwner(true);
}
@@ -190,5 +188,4 @@ public class AdminFortSiege implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java vendored
View File

@@ -112,8 +112,7 @@ public class AdminGmChat implements IAdminCommandHandler
offset = 13;
}
text = command.substring(offset);
final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text);
AdminData.getInstance().broadcastToGMs(cs);
AdminData.getInstance().broadcastToGMs((new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text)));
}
catch (StringIndexOutOfBoundsException e)
{

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGraciaSeeds.java vendored
View File

@@ -39,12 +39,7 @@ public class AdminGraciaSeeds implements IAdminCommandHandler
final StringTokenizer st = new StringTokenizer(command, " ");
final String actualCommand = st.nextToken(); // Get actual command
String val = "";
if (st.countTokens() >= 1)
{
val = st.nextToken();
}
final String val = st.countTokens() >= 1 ? st.nextToken() : "";
if (actualCommand.equalsIgnoreCase("admin_kill_tiat"))
{
GraciaSeedsManager.getInstance().increaseSoDTiatKilled();

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -68,8 +68,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (st.hasMoreTokens())
{
final int grandBossId = Integer.parseInt(st.nextToken());
manageHtml(activeChar, grandBossId);
manageHtml(activeChar, Integer.parseInt(st.nextToken()));
}
else
{
@@ -138,9 +137,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (st.hasMoreTokens())
{
final int grandBossId = Integer.parseInt(st.nextToken());
switch (grandBossId)
switch (Integer.parseInt(st.nextToken()))
{
case ANTHARAS:
{

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHeal.java vendored
View File

@@ -50,8 +50,7 @@ public class AdminHeal implements IAdminCommandHandler
{
try
{
final String healTarget = command.substring(11);
handleHeal(activeChar, healTarget);
handleHeal(activeChar, command.substring(11));
}
catch (StringIndexOutOfBoundsException e)
{

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java vendored
View File

@@ -96,8 +96,7 @@ public class AdminHtml implements IAdminCommandHandler
}
else
{
final File file = new File(Config.DATAPACK_ROOT, path);
content = HtmCache.getInstance().loadFile(file);
content = HtmCache.getInstance().loadFile((new File(Config.DATAPACK_ROOT, path)));
}
final NpcHtmlMessage html = new NpcHtmlMessage();
if (content != null)
@@ -116,5 +115,4 @@ public class AdminHtml implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

7
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminLevel.java vendored
View File

@@ -40,12 +40,7 @@ public class AdminLevel implements IAdminCommandHandler
final StringTokenizer st = new StringTokenizer(command, " ");
final String actualCommand = st.nextToken(); // Get actual command
String val = "";
if (st.countTokens() >= 1)
{
val = st.nextToken();
}
final String val = st.countTokens() >= 1 ? st.nextToken() : "";
if (actualCommand.equalsIgnoreCase("admin_add_level"))
{
try

10
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMenu.java vendored
View File

@@ -79,9 +79,7 @@ public class AdminMenu implements IAdminCommandHandler
{
try
{
final String targetName = command.substring(23);
final L2PcInstance player = L2World.getInstance().getPlayer(targetName);
teleportCharacter(player, activeChar.getLocation(), activeChar, "Admin is teleporting you.");
teleportCharacter(L2World.getInstance().getPlayer(command.substring(23)), activeChar.getLocation(), activeChar, "Admin is teleporting you.");
}
catch (StringIndexOutOfBoundsException e)
{
@@ -194,8 +192,7 @@ public class AdminMenu implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + command.substring(14), activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + command.substring(14), activeChar);
}
showMainPage(activeChar);
}
@@ -211,8 +208,7 @@ public class AdminMenu implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + command.substring(16), activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + command.substring(16), activeChar);
}
showMainPage(activeChar);
}

6
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@@ -95,8 +95,7 @@ public class AdminMobGroup implements IAdminCommandHandler
{
if (activeChar.getTarget() instanceof L2Character)
{
final L2Character target = (L2Character) activeChar.getTarget();
attack(command, activeChar, target);
attack(command, activeChar, ((L2Character) activeChar.getTarget()));
}
}
else if (command.startsWith("admin_mobgroup_rnd"))
@@ -141,8 +140,7 @@ public class AdminMobGroup implements IAdminCommandHandler
*/
private void showMainPage(L2PcInstance activeChar, String command)
{
final String filename = "mobgroup.htm";
AdminHtml.showAdminHtml(activeChar, filename);
AdminHtml.showAdminHtml(activeChar, "mobgroup.htm");
}
private void returnToChar(String command, L2PcInstance activeChar)

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPCBangPoints.java vendored
View File

@@ -139,23 +139,17 @@ public final class AdminPCBangPoints implements IAdminCommandHandler
if (range <= 0)
{
final int count = increaseForAll(L2World.getInstance().getPlayers(), value);
activeChar.sendMessage("You increased PC point(s) of all online players (" + count + ") by " + value + ".");
activeChar.sendMessage("You increased PC point(s) of all online players (" + increaseForAll(L2World.getInstance().getPlayers(), value) + ") by " + value + ".");
}
else if (range > 0)
{
final int count = increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value);
activeChar.sendMessage("You increased PC point(s) of all players (" + count + ") in range " + range + " by " + value + ".");
activeChar.sendMessage("You increased PC point(s) of all players (" + increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value) + ") in range " + range + " by " + value + ".");
}
break;
}
}
showMenuHtml(activeChar);
}
else
{
showMenuHtml(activeChar);
}
showMenuHtml(activeChar);
}
return true;
}

79
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java vendored
View File

@@ -92,12 +92,7 @@ public final class AdminPForge implements IAdminCommandHandler
}
catch (Exception e)
{
if (i > 0)
{
return true;
}
return false;
return i > 0;
}
if (opCodeLong < 0)
@@ -430,14 +425,7 @@ public final class AdminPForge implements IAdminCommandHandler
case "$boid":
{
boat = activeChar.getBoat();
if (boat != null)
{
value = String.valueOf(boat.getObjectId());
}
else
{
value = "0";
}
value = boat != null ? String.valueOf(boat.getObjectId()) : "0";
break;
}
case "$title":
@@ -481,93 +469,44 @@ public final class AdminPForge implements IAdminCommandHandler
if ((target != null) && (target instanceof L2Playable))
{
boat = ((L2Playable) target).getActingPlayer().getBoat();
if (boat != null)
{
value = String.valueOf(boat.getObjectId());
}
else
{
value = "0";
}
value = boat != null ? String.valueOf(boat.getObjectId()) : "0";
}
break;
}
case "$ttitle":
{
target = activeChar.getTarget();
if ((target != null) && (target instanceof L2Character))
{
value = String.valueOf(((L2Character) target).getTitle());
}
else
{
value = "";
}
value = (target != null) && (target instanceof L2Character) ? String.valueOf(((L2Character) target).getTitle()) : "";
break;
}
case "$tname":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getName());
}
else
{
value = "";
}
value = target != null ? String.valueOf(target.getName()) : "";
break;
}
case "$tx":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getX());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getX()) : "0";
break;
}
case "$ty":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getY());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getY()) : "0";
break;
}
case "$tz":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getZ());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getZ()) : "0";
break;
}
case "$theading":
{
target = activeChar.getTarget();
if (target != null)
{
value = String.valueOf(target.getHeading());
}
else
{
value = "0";
}
value = target != null ? String.valueOf(target.getHeading()) : "0";
break;
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java vendored
View File

@@ -213,5 +213,4 @@ public class AdminPledge implements IAdminCommandHandler
{
AdminHtml.showAdminHtml(activeChar, "game_menu.htm");
}
}

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPolymorph.java vendored
View File

@@ -164,8 +164,7 @@ public class AdminPolymorph implements IAdminCommandHandler
final L2Character Char = (L2Character) obj;
final MagicSkillUse msk = new MagicSkillUse(Char, 1008, 1, 4000, 0);
Char.broadcastPacket(msk);
final SetupGauge sg = new SetupGauge(0, 4000);
Char.sendPacket(sg);
Char.sendPacket(new SetupGauge(0, 4000));
}
// end of animation
obj.decayMe();

23
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPremium.java vendored
View File

@@ -51,8 +51,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 1, val);
addPremiumStatus(activeChar, 1, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -63,8 +62,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 2, val);
addPremiumStatus(activeChar, 2, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -75,8 +73,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
addPremiumStatus(activeChar, 3, val);
addPremiumStatus(activeChar, 3, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -87,8 +84,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(19);
viewPremiumInfo(activeChar, val);
viewPremiumInfo(activeChar, command.substring(19));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -99,8 +95,7 @@ public class AdminPremium implements IAdminCommandHandler
{
try
{
final String val = command.substring(21);
removePremium(activeChar, val);
removePremium(activeChar, command.substring(21));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -124,18 +119,14 @@ public class AdminPremium implements IAdminCommandHandler
// TODO: Add check if account exists XD
PremiumManager.getInstance().updatePremiumData(months, accountName);
final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
final long endDate = PremiumManager.getInstance().getPremiumEndDate(accountName);
admin.sendMessage("Account " + accountName + " will now have premium status until " + String.valueOf(format.format(endDate)) + ".");
admin.sendMessage("Account " + accountName + " will now have premium status until " + String.valueOf(new SimpleDateFormat("dd.MM.yyyy HH:mm").format(PremiumManager.getInstance().getPremiumEndDate(accountName))) + ".");
}
private void viewPremiumInfo(L2PcInstance admin, String accountName)
{
if (PremiumManager.getInstance().getPremiumEndDate(accountName) > 0)
{
final SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm");
final long endDate = PremiumManager.getInstance().getPremiumEndDate(accountName);
admin.sendMessage("Account " + accountName + " has premium status until " + String.valueOf(format.format(endDate)) + ".");
admin.sendMessage("Account " + accountName + " has premium status until " + String.valueOf(new SimpleDateFormat("dd.MM.yyyy HH:mm").format(PremiumManager.getInstance().getPremiumEndDate(accountName))) + ".");
}
else
{

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPrimePoints.java vendored
View File

@@ -123,23 +123,17 @@ public final class AdminPrimePoints implements IAdminCommandHandler
if (range <= 0)
{
final int count = increaseForAll(L2World.getInstance().getPlayers(), value);
activeChar.sendMessage("You increased NCoin(s) of all online players (" + count + ") by " + value + ".");
activeChar.sendMessage("You increased NCoin(s) of all online players (" + increaseForAll(L2World.getInstance().getPlayers(), value) + ") by " + value + ".");
}
else if (range > 0)
{
final int count = increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value);
activeChar.sendMessage("You increased NCoin(s) of all players (" + count + ") in range " + range + " by " + value + ".");
activeChar.sendMessage("You increased NCoin(s) of all players (" + increaseForAll(activeChar.getKnownList().getKnownPlayers().values(), value) + ") in range " + range + " by " + value + ".");
}
break;
}
}
showMenuHtml(activeChar);
}
else
{
showMenuHtml(activeChar);
}
showMenuHtml(activeChar);
}
return true;
}

9
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPunishment.java vendored
View File

@@ -91,8 +91,7 @@ public class AdminPunishment implements IAdminCommandHandler
}
else
{
final String subcmd = st.nextToken();
switch (subcmd)
switch (st.nextToken())
{
case "info":
{
@@ -388,11 +387,7 @@ public class AdminPunishment implements IAdminCommandHandler
private static final String findCharId(String key)
{
final int charId = CharNameTable.getInstance().getIdByName(key);
if (charId > 0) // Yeah its a char name!
{
return Integer.toString(charId);
}
return key;
return charId > 0 ? Integer.toString(charId) : key;
}
@Override

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -76,8 +76,7 @@ public class AdminQuest implements IAdminCommandHandler
// try the first param as id
try
{
final int questId = Integer.parseInt(parts[1]);
if (QuestManager.getInstance().reload(questId))
if (QuestManager.getInstance().reload(Integer.parseInt(parts[1])))
{
activeChar.sendMessage("Quest Reloaded Successfully.");
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminReload.java vendored
View File

@@ -298,5 +298,4 @@ public class AdminReload implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminRide.java vendored
View File

@@ -167,5 +167,4 @@ public class AdminRide implements IAdminCommandHandler
{
return ADMIN_COMMANDS;
}
}

4
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminServerInfo.java vendored
View File

@@ -92,9 +92,7 @@ public class AdminServerInfo implements IAdminCommandHandler
time -= TimeUnit.DAYS.toMillis(days);
final long hours = TimeUnit.MILLISECONDS.toHours(time);
time -= TimeUnit.HOURS.toMillis(hours);
final long minutes = TimeUnit.MILLISECONDS.toMinutes(time);
return days + " Days, " + hours + " Hours, " + minutes + " Minutes";
return days + " Days, " + hours + " Hours, " + TimeUnit.MILLISECONDS.toMinutes(time) + " Minutes";
}
private String buildTheardInfo(String category)

9
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -94,13 +94,10 @@ public class AdminShowQuests implements IAdminCommandHandler
val[0] = "name";
val[1] = cmdParams[2];
}
if (cmdParams.length > 3)
if ((cmdParams.length > 3) && cmdParams[3].equals("custom"))
{
if (cmdParams[3].equals("custom"))
{
val[0] = "custom";
val[1] = cmdParams[2];
}
val[0] = "custom";
val[1] = cmdParams[2];
}
}
}

1
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminShutdown.java vendored
View File

@@ -125,5 +125,4 @@ public class AdminShutdown implements IAdminCommandHandler
{
Shutdown.getInstance().abort(activeChar);
}
}

37
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -94,8 +94,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(20);
removeSkillsPage(activeChar, Integer.parseInt(val));
removeSkillsPage(activeChar, Integer.parseInt(command.substring(20)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -109,8 +108,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(18);
AdminHtml.showAdminHtml(activeChar, "skills/" + val + ".htm");
AdminHtml.showAdminHtml(activeChar, "skills/" + command.substring(18) + ".htm");
}
catch (StringIndexOutOfBoundsException e)
{
@@ -120,8 +118,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String val = command.substring(15);
adminAddSkill(activeChar, val);
adminAddSkill(activeChar, command.substring(15));
}
catch (Exception e)
{
@@ -132,9 +129,7 @@ public class AdminSkill implements IAdminCommandHandler
{
try
{
final String id = command.substring(19);
final int idval = Integer.parseInt(id);
adminRemoveSkill(activeChar, idval);
adminRemoveSkill(activeChar, Integer.parseInt(command.substring(19)));
}
catch (Exception e)
{
@@ -308,19 +303,13 @@ public class AdminSkill implements IAdminCommandHandler
}
final int skillsStart = maxSkillsPerPage * page;
int skillsEnd = skills.length;
if ((skillsEnd - skillsStart) > maxSkillsPerPage)
{
skillsEnd = skillsStart + maxSkillsPerPage;
}
final int skillsEnd = (skills.length - skillsStart) > maxSkillsPerPage ? skillsStart + maxSkillsPerPage : skills.length;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
final StringBuilder replyMSG = StringUtil.startAppend(500 + (maxPages * 50) + (((skillsEnd - skillsStart) + 1) * 50), "<html><body><table width=260><tr><td width=40><button value=\"Main\" action=\"bypass -h admin_admin\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Character Selection Menu</center></td><td width=40><button value=\"Back\" action=\"bypass -h admin_show_skills\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><br><br><center>Editing <font color=\"LEVEL\">", player.getName(), "</font></center><br><table width=270><tr><td>Lv: ", String.valueOf(player.getLevel()), " ", ClassListData.getInstance().getClass(player.getClassId()).getClientCode(), "</td></tr></table><br><table width=270><tr><td>Note: Dont forget that modifying players skills can</td></tr><tr><td>ruin the game...</td></tr></table><br><center>Click on the skill you wish to remove:</center><br><center><table width=270><tr>");
for (int x = 0; x < maxPages; x++)
{
final int pagenr = x + 1;
StringUtil.append(replyMSG, "<td><a action=\"bypass -h admin_remove_skills ", String.valueOf(x), "\">Page ", String.valueOf(pagenr), "</a></td>");
StringUtil.append(replyMSG, "<td><a action=\"bypass -h admin_remove_skills ", String.valueOf(x), "\">Page ", String.valueOf((x + 1)), "</a></td>");
}
replyMSG.append("</tr></table></center><br><table width=270><tr><td width=80>Name:</td><td width=60>Level:</td><td width=40>Id:</td></tr>");
@@ -448,20 +437,12 @@ public class AdminSkill implements IAdminCommandHandler
}
final L2PcInstance player = target.getActingPlayer();
final StringTokenizer st = new StringTokenizer(val);
if (st.countTokens() != 2)
{
showMainPage(activeChar);
}
else
if (st.countTokens() == 2)
{
Skill skill = null;
try
{
final String id = st.nextToken();
final String level = st.nextToken();
final int idval = Integer.parseInt(id);
final int levelval = Integer.parseInt(level);
skill = SkillData.getInstance().getSkill(idval, levelval);
skill = SkillData.getInstance().getSkill(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
}
catch (Exception e)
{
@@ -486,8 +467,8 @@ public class AdminSkill implements IAdminCommandHandler
{
activeChar.sendMessage("Error: there is no such skill.");
}
showMainPage(activeChar); // Back to start
}
showMainPage(activeChar); // Back to start
}
/**

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java vendored
View File

@@ -71,8 +71,7 @@ public class AdminSummon implements IAdminCommandHandler
_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + subCommand + ", but have no access to it!");
return false;
}
final IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
ach.useAdminCommand(subCommand + " " + id + " " + count, activeChar);
AdminCommandHandler.getInstance().getHandler(subCommand).useAdminCommand(subCommand + " " + id + " " + count, activeChar);
}
else
{

12
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java vendored
View File

@@ -140,8 +140,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String val = command.substring(14);
teleportTo(activeChar, val);
teleportTo(activeChar, command.substring(14));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -158,9 +157,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String val = command.substring(25);
teleportCharacter(activeChar, val);
teleportCharacter(activeChar, command.substring(25));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -173,9 +170,7 @@ public class AdminTeleport implements IAdminCommandHandler
{
try
{
final String targetName = command.substring(17);
final L2PcInstance player = L2World.getInstance().getPlayer(targetName);
teleportToCharacter(activeChar, player);
teleportToCharacter(activeChar, L2World.getInstance().getPlayer(command.substring(17)));
}
catch (StringIndexOutOfBoundsException e)
{
@@ -646,5 +641,4 @@ public class AdminTeleport implements IAdminCommandHandler
activeChar.sendPacket(SystemMessageId.INVALID_TARGET);
}
}
}

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminVitality.java vendored
View File

@@ -57,8 +57,7 @@ public class AdminVitality implements IAdminCommandHandler
if (activeChar.getTarget() instanceof L2PcInstance)
{
L2PcInstance target;
target = (L2PcInstance) activeChar.getTarget();
final L2PcInstance target = (L2PcInstance) activeChar.getTarget();
if (cmd.equals("admin_set_vitality"))
{

3
trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java vendored
View File

@@ -97,8 +97,7 @@ public class AdminZone implements IAdminCommandHandler
}
else
{
final int zoneId = Integer.parseInt(next);
ZoneManager.getInstance().getZoneById(zoneId).visualizeZone(activeChar.getZ());
ZoneManager.getInstance().getZoneById(Integer.parseInt(next)).visualizeZone(activeChar.getZ());
}
}
else if (actualCommand.equalsIgnoreCase("admin_zone_visual_clear"))

3
trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -114,8 +114,7 @@ public class NpcViewMod implements IBypassHandler
{
return false;
}
final int page = st.hasMoreElements() ? Integer.parseInt(st.nextToken()) : 0;
sendNpcDropList(activeChar, npc, dropListScope, page);
sendNpcDropList(activeChar, npc, dropListScope, (st.hasMoreElements() ? Integer.parseInt(st.nextToken()) : 0));
}
catch (NumberFormatException e)
{

4
trunk/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java vendored
View File

@@ -87,9 +87,7 @@ public class OlympiadManagerLink implements IBypassHandler
{
if (command.toLowerCase().startsWith("olympiaddesc"))
{
final int val = Integer.parseInt(command.substring(13, 14));
final String suffix = command.substring(14);
((L2OlympiadManagerInstance) target).showChatWindow(activeChar, val, suffix);
((L2OlympiadManagerInstance) target).showChatWindow(activeChar, Integer.parseInt(command.substring(13, 14)), command.substring(14));
}
else if (command.toLowerCase().startsWith("olympiadnoble"))
{

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