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

Code style changes.

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

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

@@ -177,14 +177,13 @@ public class EnergySeeds extends AbstractNpcAI
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
}
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED);
if (getRandom(100) < 33)
{
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED);
caster.addItem("EnergySeed", itemId, getRandom(RATE + 1, 2 * RATE), null, true);
}
else
{
caster.sendPacket(SystemMessageId.YOUR_COLLECTION_HAS_SUCCEEDED);
caster.addItem("EnergySeed", itemId, getRandom(1, RATE), null, true);
}
seedCollectEvent(caster, npc, spawn._seedId);

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

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

2
trunk/dist/game/data/scripts/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java vendored
View File

@@ -70,7 +70,7 @@ public final class ZealotOfShilen extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
return (npc.isAttackingNow()) ? "32628-01.html" : npc.getId() + ".html";
return npc.isAttackingNow() ? "32628-01.html" : npc.getId() + ".html";
}
@Override

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

@@ -806,7 +806,7 @@ public final class Stage1 extends Quest
if (!isSummon && (player != null))
{
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId());
if ((tmpworld instanceof SOD1World) && (((SOD1World) tmpworld).getStatus() == 7) && spawnState(((SOD1World) tmpworld)))
if ((tmpworld instanceof SOD1World) && (((SOD1World) tmpworld).getStatus() == 7) && spawnState((SOD1World) tmpworld))
{
for (int objId : ((SOD1World) tmpworld).getAllowed())
{
@@ -997,7 +997,7 @@ public final class Stage1 extends Quest
if (npcId == ALENOS)
{
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
if ((GraciaSeedsManager.getInstance().getSoDState() == 1) || ((world != null) && (world instanceof SOD1World)))
if ((GraciaSeedsManager.getInstance().getSoDState() == 1) || (world instanceof SOD1World))
{
enterInstance(player, "SeedOfDestructionStage1.xml", ENTER_TELEPORT_1);
}

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

@@ -182,7 +182,6 @@ public final class HallOfSuffering extends AbstractNpcAI
private static final int TEMPLATE_ID = 115;
private static final int MIN_LEVEL = 75;
private static final int MAX_LEVEL = 82;
private static final boolean debug = false;
public HallOfSuffering()
{
@@ -198,11 +197,6 @@ public final class HallOfSuffering extends AbstractNpcAI
private static boolean checkConditions(L2PcInstance player)
{
if (debug)
{
return true;
}
final L2Party party = player.getParty();
if (party == null)
{
@@ -514,7 +508,7 @@ public final class HallOfSuffering extends AbstractNpcAI
else if (event.equalsIgnoreCase("ressurectTwin"))
{
final Skill skill = SkillData.getInstance().getSkill(5824, 1);
final L2Npc aliveTwin = (world.klanikus == npc ? world.klodekus : world.klanikus);
final L2Npc aliveTwin = world.klanikus == npc ? world.klodekus : world.klanikus;
npc.doRevive();
npc.doCast(skill);
npc.setCurrentHp(aliveTwin.getCurrentHp());

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

@@ -398,16 +398,13 @@ public abstract class AirShipController extends Quest
{
_log.log(Level.WARNING, getName() + ": Fuel consumption not defined.");
}
else if (_teleportsTable.length != _fuelTable.length)
{
_log.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list.");
}
else
{
if (_teleportsTable.length != _fuelTable.length)
{
_log.log(Level.WARNING, getName() + ": Fuel consumption not match teleport list.");
}
else
{
AirShipManager.getInstance().registerAirShipTeleportList(_dockZone, _locationId, _teleportsTable, _fuelTable);
}
AirShipManager.getInstance().registerAirShipTeleportList(_dockZone, _locationId, _teleportsTable, _fuelTable);
}
}
}