Separated multiple variable declarations.

This commit is contained in:
MobiusDev
2018-09-09 23:01:15 +00:00
parent d33bfa17b2
commit 0f430720db
881 changed files with 3909 additions and 1507 deletions

View File

@@ -1113,10 +1113,24 @@ public class Frintezza extends Quest
private static int _KillDarkChoirCaptain = 0;
private static L2BossZone _Zone;
private L2GrandBossInstance frintezza;
private L2GrandBossInstance weakScarlet;
private L2GrandBossInstance strongScarlet;
@SuppressWarnings("unused")
private L2GrandBossInstance frintezza, weakScarlet, strongScarlet, activeScarlet;
private L2MonsterInstance demon1, demon2, demon3, demon4, portrait1, portrait2, portrait3, portrait4;
private L2NpcInstance _frintezzaDummy, _overheadDummy, _portraitDummy1, _portraitDummy3, _scarletDummy;
private L2GrandBossInstance activeScarlet;
private L2MonsterInstance demon1;
private L2MonsterInstance demon2;
private L2MonsterInstance demon3;
private L2MonsterInstance demon4;
private L2MonsterInstance portrait1;
private L2MonsterInstance portrait2;
private L2MonsterInstance portrait3;
private L2MonsterInstance portrait4;
private L2NpcInstance _frintezzaDummy;
private L2NpcInstance _overheadDummy;
private L2NpcInstance _portraitDummy1;
private L2NpcInstance _portraitDummy3;
private L2NpcInstance _scarletDummy;
private final List<L2PcInstance> _PlayersInside = new CopyOnWriteArrayList<>();
private final List<L2NpcInstance> _Room1Mobs = new CopyOnWriteArrayList<>();
private final List<L2NpcInstance> _Room2Mobs = new CopyOnWriteArrayList<>();
@@ -1378,8 +1392,8 @@ public class Frintezza extends Quest
DoorTable.getInstance().getDoor(25150046).closeMe();
}
/*
* else if (event.equals("loc_check")) { Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == FIGHTING) { if (!_Zone.isInsideZone(npc)) npc.teleToLocation(getXFix(174232),getYFix(-88020),getZFix(-5116)); if (npc.getX() < getXFix(171932) ||
* npc.getX() > getXFix(176532) || npc.getY() < getYFix(-90320) || npc.getY() > getYFix(-85720) || npc.getZ() < getZFix(-5130)) npc.teleToLocation(getXFix(174232),getYFix(-88020),getZFix(-5116)); } }
* else if (event.equals("loc_check")) { Integer status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA); if (status == FIGHTING) { if (!_Zone.isInsideZone(npc)) npc.teleToLocation(getXFix(174232),getYFix(-88020),getZFix(-5116)); if (npc.getX() < getXFix(171932) || npc.getX() >
* getXFix(176532) || npc.getY() < getYFix(-90320) || npc.getY() > getYFix(-85720) || npc.getZ() < getZFix(-5130)) npc.teleToLocation(getXFix(174232),getYFix(-88020),getZFix(-5116)); } }
*/
else if (event.equals("camera_1"))
{

View File

@@ -287,7 +287,8 @@ public class Q021_HiddenTruth extends Quest
// For cond 6, make checks until cond 7 is activated.
if (cond == 6)
{
int npcId1 = 0, npcId2 = 0;
int npcId1 = 0;
int npcId2 = 0;
if (npcId == AGRIPEL)
{
npcId1 = BENEDICT;

View File

@@ -269,7 +269,15 @@ public class Q662_AGameOfCards extends Quest
int state = st.getInt("state");
int stateEx = st.getInt("stateEx");
int i0, i1, i2, i3, i4, i5, i6, i8, i9;
int i0;
int i1;
int i2;
int i3;
int i4;
int i5;
int i6;
int i8;
int i9;
i0 = state;
i1 = stateEx;
@@ -581,7 +589,13 @@ public class Q662_AGameOfCards extends Quest
}
else if ((state != 0) && (stateEx != 0))
{
int i0, i1, i2, i3, i4, i5, i9;
int i0;
int i1;
int i2;
int i3;
int i4;
int i5;
int i9;
i0 = state;
i1 = stateEx;