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

8
trunk/java/com/l2jmobius/gameserver/instancemanager/MercTicketManager.java
View File

@@ -121,7 +121,7 @@ public final class MercTicketManager
for (int i2 = 0; i2 < 50; i2 += 10)
{
// Simplified if statement;
if (((itemId >= ITEM_IDS[i2 + (i * GUARDIAN_TYPES_COUNT)]) && (itemId <= ITEM_IDS[i2 + 9 + (i * GUARDIAN_TYPES_COUNT)])))
if ((itemId >= ITEM_IDS[i2 + (i * GUARDIAN_TYPES_COUNT)]) && (itemId <= ITEM_IDS[i2 + 9 + (i * GUARDIAN_TYPES_COUNT)]))
{
return i + 1;
}
@@ -182,7 +182,7 @@ public final class MercTicketManager
if (NPC_IDS[i] == npcId) // Find the index of the item used
{
// only handle tickets if a siege is not ongoing in this npc's castle
if ((castle != null) && !(castle.getSiege().isInProgress()))
if ((castle != null) && !castle.getSiege().isInProgress())
{
itemId = ITEM_IDS[i];
// create the ticket in the gameworld
@@ -346,7 +346,7 @@ public final class MercTicketManager
final L2DefenderInstance npc = new L2DefenderInstance(template);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
npc.setDecayed(false);
npc.spawnMe(x, y, (z + 20));
npc.spawnMe(x, y, z + 20);
if (despawnDelay > 0)
{
npc.scheduleDespawn(despawnDelay);
@@ -413,7 +413,7 @@ public final class MercTicketManager
* Gets the single instance of {@code MercTicketManager}.
* @return single instance of {@code MercTicketManager}
*/
public static final MercTicketManager getInstance()
public static MercTicketManager getInstance()
{
return SingletonHolder._instance;
}