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

Visibility changes.

Browse Source
This commit is contained in:
MobiusDev
2016-01-29 14:13:33 +00:00
parent 6e536fc2dd
commit 13507ad46c
298 changed files with 563 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@ -103,7 +103,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
finishInstance(world, Config.INSTANCE_FINISH_TIME);
}
protected void finishInstance(InstanceWorld world, int duration)
private void finishInstance(InstanceWorld world, int duration)
{
final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
@ -173,7 +173,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
}
}
protected void handleRemoveBuffs(InstanceWorld world)
private void handleRemoveBuffs(InstanceWorld world)
{
for (int objId : world.getAllowed())
{
@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
* @param world the instance
* @param time the time in milliseconds
*/
protected void setReenterTime(InstanceWorld world, long time)
private void setReenterTime(InstanceWorld world, long time)
{
for (int objectId : world.getAllowed())
{

14
trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java vendored
View File

@ -39,14 +39,14 @@ import instances.AbstractInstance;
*/
public final class CavernOfThePirateCaptain extends AbstractInstance
{
protected class CavernOfThePirateCaptainWorld extends InstanceWorld
class CavernOfThePirateCaptainWorld extends InstanceWorld
{
protected List<L2PcInstance> playersInside = new ArrayList<>();
protected L2Attackable _zaken;
protected long storeTime = 0;
protected boolean _is83;
protected int _zakenRoom;
protected int _blueFounded;
final List<L2PcInstance> playersInside = new ArrayList<>();
L2Attackable _zaken;
long storeTime = 0;
boolean _is83;
int _zakenRoom;
int _blueFounded;
}
// NPCs

34
trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java vendored
View File

@ -49,28 +49,28 @@ import instances.AbstractInstance;
* Chambers of Delusion superclass.
* @author GKR
*/
public abstract class Chamber extends AbstractInstance
abstract class Chamber extends AbstractInstance
{
protected class CDWorld extends InstanceWorld
private class CDWorld extends InstanceWorld
{
protected int currentRoom;
protected final L2Party partyInside;
protected final ScheduledFuture<?> _banishTask;
protected ScheduledFuture<?> _roomChangeTask;
int currentRoom;
final L2Party partyInside;
final ScheduledFuture<?> _banishTask;
private ScheduledFuture<?> _roomChangeTask;
protected CDWorld(L2Party party)
CDWorld(L2Party party)
{
currentRoom = 0;
partyInside = party;
_banishTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new BanishTask(), 60000, 60000);
}
protected L2Party getPartyInside()
L2Party getPartyInside()
{
return partyInside;
}
protected void scheduleRoomChange(boolean bossRoom)
void scheduleRoomChange(boolean bossRoom)
{
final Instance inst = InstanceManager.getInstance().getInstance(getInstanceId());
final long nextInterval = bossRoom ? 60000L : (ROOM_CHANGE_INTERVAL + getRandom(ROOM_CHANGE_RANDOM_TIME)) * 1000L;
@ -82,17 +82,17 @@ public abstract class Chamber extends AbstractInstance
}
}
protected void stopBanishTask()
void stopBanishTask()
{
_banishTask.cancel(true);
}
protected void stopRoomChangeTask()
void stopRoomChangeTask()
{
_roomChangeTask.cancel(true);
}
protected class BanishTask implements Runnable
class BanishTask implements Runnable
{
@Override
public void run()
@ -120,7 +120,7 @@ public abstract class Chamber extends AbstractInstance
}
}
protected class ChangeRoomTask implements Runnable
class ChangeRoomTask implements Runnable
{
@Override
public void run()
@ -285,7 +285,7 @@ public abstract class Chamber extends AbstractInstance
}
}
protected void changeRoom(CDWorld world)
void changeRoom(CDWorld world)
{
final L2Party party = world.getPartyInside();
final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
@ -297,7 +297,7 @@ public abstract class Chamber extends AbstractInstance
int newRoom = world.currentRoom;
// Do nothing, if there are raid room of Sqare or Tower Chamber
// Do nothing, if there are raid room of Square or Tower Chamber
if (isBigChamber() && isBossRoom(world))
{
return;
@ -384,7 +384,7 @@ public abstract class Chamber extends AbstractInstance
changeRoom(world);
}
protected void earthQuake(CDWorld world)
void earthQuake(CDWorld world)
{
final L2Party party = world.getPartyInside();
@ -416,7 +416,7 @@ public abstract class Chamber extends AbstractInstance
}
}
protected void exitInstance(L2PcInstance player)
void exitInstance(L2PcInstance player)
{
if ((player == null) || !player.isOnline() || (player.getInstanceId() == 0))
{

32
trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java vendored
View File

@ -73,11 +73,11 @@ import instances.AbstractInstance;
*/
public final class CrystalCaverns extends AbstractInstance
{
protected static class CrystalGolem
static class CrystalGolem
{
protected L2ItemInstance foodItem = null;
protected boolean isAtDestination = false;
protected Location oldLoc = null;
L2ItemInstance foodItem = null;
boolean isAtDestination = false;
Location oldLoc = null;
}
private class CCWorld extends InstanceWorld
@ -719,7 +719,7 @@ public final class CrystalCaverns extends AbstractInstance
}
}
protected void stopAttack(L2PcInstance player)
private void stopAttack(L2PcInstance player)
{
player.setTarget(null);
player.abortAttack();
@ -748,21 +748,21 @@ public final class CrystalCaverns extends AbstractInstance
});
}
protected void runOracle(CCWorld world)
private void runOracle(CCWorld world)
{
world.setStatus(0);
world.oracle.add(addSpawn(ORACLE_GUIDE_1, 143172, 148894, -11975, 0, false, 0, false, world.getInstanceId()));
}
protected void runEmerald(CCWorld world)
private void runEmerald(CCWorld world)
{
world.setStatus(1);
runFirst(world);
openDoor(DOOR1, world.getInstanceId());
}
protected void runCoral(CCWorld world)
private void runCoral(CCWorld world)
{
world.setStatus(1);
runHall(world);
@ -770,7 +770,7 @@ public final class CrystalCaverns extends AbstractInstance
openDoor(DOOR5, world.getInstanceId());
}
protected void runHall(CCWorld world)
private void runHall(CCWorld world)
{
world.setStatus(2);
@ -781,7 +781,7 @@ public final class CrystalCaverns extends AbstractInstance
}
}
protected void runFirst(CCWorld world)
private void runFirst(CCWorld world)
{
world.setStatus(2);
@ -794,7 +794,7 @@ public final class CrystalCaverns extends AbstractInstance
}
}
protected void runEmeraldSquare(CCWorld world)
private void runEmeraldSquare(CCWorld world)
{
world.setStatus(3);
@ -807,7 +807,7 @@ public final class CrystalCaverns extends AbstractInstance
world.npcList2.put(0, spawnList);
}
protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room)
private void runEmeraldRooms(CCWorld world, int[][] spawnList, int room)
{
final Map<L2Npc, Boolean> spawned = new HashMap<>();
for (int[] spawn : spawnList)
@ -823,7 +823,7 @@ public final class CrystalCaverns extends AbstractInstance
world.roomsStatus[room - 1] = 1;
}
protected void runDarnel(CCWorld world)
private void runDarnel(CCWorld world)
{
world.setStatus(9);
@ -833,7 +833,7 @@ public final class CrystalCaverns extends AbstractInstance
openDoor(24220006, world.getInstanceId());
}
protected void runSteamRooms(CCWorld world, int[][] spawnList, int status)
private void runSteamRooms(CCWorld world, int[][] spawnList, int status)
{
world.setStatus(status);
@ -846,7 +846,7 @@ public final class CrystalCaverns extends AbstractInstance
world.npcList2.put(0, spawned);
}
protected void runSteamOracles(CCWorld world, int[][] oracleOrder)
private void runSteamOracles(CCWorld world, int[][] oracleOrder)
{
world.oracles.clear();
for (int[] oracle : oracleOrder)
@ -855,7 +855,7 @@ public final class CrystalCaverns extends AbstractInstance
}
}
protected boolean checkKillProgress(int room, L2Npc mob, CCWorld world)
private boolean checkKillProgress(int room, L2Npc mob, CCWorld world)
{
if (world.npcList2.get(room).containsKey(mob))
{

70
trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java vendored
View File

@ -43,9 +43,9 @@ import instances.AbstractInstance;
*/
public final class DarkCloudMansion extends AbstractInstance
{
protected class DMCWorld extends InstanceWorld
class DMCWorld extends InstanceWorld
{
protected Map<String, DMCRoom> rooms = new ConcurrentHashMap<>();
final Map<String, DMCRoom> rooms = new ConcurrentHashMap<>();
}
// NPCs
@ -216,23 +216,23 @@ public final class DarkCloudMansion extends AbstractInstance
addKillId(TOKILL);
}
protected static class DMCNpc
static class DMCNpc
{
public L2Npc npc;
public boolean isDead = false;
public L2Npc golem = null;
public int status = 0;
public int order = 0;
public int count = 0;
L2Npc npc;
boolean isDead = false;
L2Npc golem = null;
int status = 0;
int order = 0;
int count = 0;
}
protected static class DMCRoom
static class DMCRoom
{
public List<DMCNpc> npcList = new ArrayList<>();
public int counter = 0;
public int reset = 0;
public int founded = 0;
public int[] Order;
final List<DMCNpc> npcList = new ArrayList<>();
int counter = 0;
int reset = 0;
int founded = 0;
int[] Order;
}
@Override
@ -298,7 +298,7 @@ public final class DarkCloudMansion extends AbstractInstance
}
}
protected void runStartRoom(DMCWorld world)
private void runStartRoom(DMCWorld world)
{
world.setStatus(0);
final DMCRoom StartRoom = new DMCRoom();
@ -322,7 +322,7 @@ public final class DarkCloudMansion extends AbstractInstance
world.rooms.put("StartRoom", StartRoom);
}
protected void spawnHall(DMCWorld world)
private void spawnHall(DMCWorld world)
{
final DMCRoom Hall = new DMCRoom();
DMCNpc thisnpc;
@ -395,14 +395,14 @@ public final class DarkCloudMansion extends AbstractInstance
world.rooms.put("Hall", Hall);
}
protected void runHall(DMCWorld world)
private void runHall(DMCWorld world)
{
spawnHall(world);
world.setStatus(1);
openDoor(D1, world.getInstanceId());
}
protected void runFirstRoom(DMCWorld world)
private void runFirstRoom(DMCWorld world)
{
final DMCRoom FirstRoom = new DMCRoom();
DMCNpc thisnpc;
@ -444,14 +444,14 @@ public final class DarkCloudMansion extends AbstractInstance
openDoor(D2, world.getInstanceId());
}
protected void runHall2(DMCWorld world)
private void runHall2(DMCWorld world)
{
addSpawn(SOFaith, 147818, 179643, -6117, 0, false, 0, false, world.getInstanceId());
spawnHall(world);
world.setStatus(3);
}
protected void runSecondRoom(DMCWorld world)
private void runSecondRoom(DMCWorld world)
{
final DMCRoom SecondRoom = new DMCRoom();
DMCNpc thisnpc;
@ -501,14 +501,14 @@ public final class DarkCloudMansion extends AbstractInstance
openDoor(D3, world.getInstanceId());
}
protected void runHall3(DMCWorld world)
private void runHall3(DMCWorld world)
{
addSpawn(SOAdversity, 147808, 181281, -6117, 16383, false, 0, false, world.getInstanceId());
spawnHall(world);
world.setStatus(5);
}
protected void runThirdRoom(DMCWorld world)
private void runThirdRoom(DMCWorld world)
{
final DMCRoom ThirdRoom = new DMCRoom();
final DMCNpc thisnpc = new DMCNpc();
@ -554,7 +554,7 @@ public final class DarkCloudMansion extends AbstractInstance
openDoor(D4, world.getInstanceId());
}
protected void runThirdRoom2(DMCWorld world)
private void runThirdRoom2(DMCWorld world)
{
addSpawn(SOAdventure, 148910, 178397, -6117, 16383, false, 0, false, world.getInstanceId());
final DMCRoom ThirdRoom = new DMCRoom();
@ -600,7 +600,7 @@ public final class DarkCloudMansion extends AbstractInstance
world.setStatus(8);
}
protected void runForthRoom(DMCWorld world)
private void runForthRoom(DMCWorld world)
{
final DMCRoom ForthRoom = new DMCRoom();
ForthRoom.counter = 0;
@ -647,7 +647,7 @@ public final class DarkCloudMansion extends AbstractInstance
openDoor(D5, world.getInstanceId());
}
protected void runFifthRoom(DMCWorld world)
private void runFifthRoom(DMCWorld world)
{
spawnFifthRoom(world);
world.setStatus(9);
@ -689,7 +689,7 @@ public final class DarkCloudMansion extends AbstractInstance
world.rooms.put("FifthRoom", FifthRoom);
}
protected boolean checkKillProgress(L2Npc npc, DMCRoom room)
private boolean checkKillProgress(L2Npc npc, DMCRoom room)
{
boolean cont = true;
for (DMCNpc npcobj : room.npcList)
@ -707,7 +707,7 @@ public final class DarkCloudMansion extends AbstractInstance
return cont;
}
protected void spawnRndGolem(DMCWorld world, DMCNpc npc)
private void spawnRndGolem(DMCWorld world, DMCNpc npc)
{
if (npc.golem != null)
{
@ -726,7 +726,7 @@ public final class DarkCloudMansion extends AbstractInstance
}
}
protected void checkStone(L2Npc npc, int order[], DMCNpc npcObj, DMCWorld world)
private void checkStone(L2Npc npc, int order[], DMCNpc npcObj, DMCWorld world)
{
for (int i = 1; i < 7; i++)
{
@ -747,14 +747,14 @@ public final class DarkCloudMansion extends AbstractInstance
spawnRndGolem(world, npcObj);
}
protected void endInstance(DMCWorld world)
private void endInstance(DMCWorld world)
{
world.setStatus(10);
addSpawn(SOTruth, 148911, 181940, -6117, 16383, false, 0, false, world.getInstanceId());
world.rooms.clear();
}
protected void checkBelethSample(DMCWorld world, L2Npc npc, L2PcInstance player)
private void checkBelethSample(DMCWorld world, L2Npc npc, L2PcInstance player)
{
final DMCRoom FifthRoom = world.rooms.get("FifthRoom");
@ -787,7 +787,7 @@ public final class DarkCloudMansion extends AbstractInstance
}
}
protected void killedBelethSample(DMCWorld world, L2Npc npc)
private void killedBelethSample(DMCWorld world, L2Npc npc)
{
int decayedSamples = 0;
final DMCRoom FifthRoom = world.rooms.get("FifthRoom");
@ -837,7 +837,7 @@ public final class DarkCloudMansion extends AbstractInstance
}
}
protected boolean allStonesDone(DMCWorld world)
private boolean allStonesDone(DMCWorld world)
{
final DMCRoom SecondRoom = world.rooms.get("SecondRoom");
@ -853,7 +853,7 @@ public final class DarkCloudMansion extends AbstractInstance
return true;
}
protected void removeMonoliths(DMCWorld world)
private void removeMonoliths(DMCWorld world)
{
final DMCRoom SecondRoom = world.rooms.get("SecondRoom");
@ -863,7 +863,7 @@ public final class DarkCloudMansion extends AbstractInstance
}
}
protected void chkShadowColumn(DMCWorld world, L2Npc npc)
private void chkShadowColumn(DMCWorld world, L2Npc npc)
{
final DMCRoom ForthRoom = world.rooms.get("ForthRoom");

10
trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java vendored
View File

@ -43,11 +43,11 @@ import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmpero
*/
public final class DisciplesNecropolisPast extends AbstractInstance
{
protected class DNPWorld extends InstanceWorld
class DNPWorld extends InstanceWorld
{
protected final List<L2Npc> anakimGroup = new ArrayList<>();
protected final List<L2Npc> lilithGroup = new ArrayList<>();
protected int countKill = 0;
final List<L2Npc> anakimGroup = new ArrayList<>();
final List<L2Npc> lilithGroup = new ArrayList<>();
int countKill = 0;
}
// NPCs
@ -132,7 +132,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance
addTalkId(PROMISE_OF_MAMMON, SHUNAIMAN, LEON, DISCIPLES_GATEKEEPER);
}
protected void spawnNPC(DNPWorld world)
private void spawnNPC(DNPWorld world)
{
for (Map.Entry<Integer, Location> entry : LILITH_SPAWN.entrySet())
{

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

@ -35,7 +35,7 @@ import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal;
*/
public final class ElcadiasTent extends AbstractInstance
{
protected class ETWorld extends InstanceWorld
class ETWorld extends InstanceWorld
{
}

4
trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java vendored
View File

@ -34,7 +34,7 @@ import quests.Q10735_ASpecialPower.Q10735_ASpecialPower;
*/
public final class FaeronTrainingGrounds1 extends AbstractInstance
{
// NPC's
// NPCs
private static final int AYANTHE = 33942;
private static final int AYANTHE_2 = 33944;
// Locations
@ -43,7 +43,7 @@ public final class FaeronTrainingGrounds1 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 251;
protected class FTGWorld extends InstanceWorld
class FTGWorld extends InstanceWorld
{
}

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

@ -43,7 +43,7 @@ public final class FaeronTrainingGrounds2 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 252;
protected class FTGWorld extends InstanceWorld
class FTGWorld extends InstanceWorld
{
}

91
trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java vendored
View File

@ -81,42 +81,42 @@ import instances.AbstractInstance;
*/
public final class FinalEmperialTomb extends AbstractInstance
{
protected class FETWorld extends InstanceWorld
class FETWorld extends InstanceWorld
{
protected Lock lock = new ReentrantLock();
protected List<L2Npc> npcList = new CopyOnWriteArrayList<>();
protected int darkChoirPlayerCount = 0;
protected FrintezzaSong OnSong = null;
protected ScheduledFuture<?> songTask = null;
protected ScheduledFuture<?> songEffectTask = null;
protected boolean isVideo = false;
protected L2Npc frintezzaDummy = null;
protected L2Npc overheadDummy = null;
protected L2Npc portraitDummy1 = null;
protected L2Npc portraitDummy3 = null;
protected L2Npc scarletDummy = null;
protected L2GrandBossInstance frintezza = null;
protected L2GrandBossInstance activeScarlet = null;
protected List<L2MonsterInstance> demons = new CopyOnWriteArrayList<>();
protected Map<L2MonsterInstance, Integer> portraits = new ConcurrentHashMap<>();
protected int scarlet_x = 0;
protected int scarlet_y = 0;
protected int scarlet_z = 0;
protected int scarlet_h = 0;
protected int scarlet_a = 0;
final Lock lock = new ReentrantLock();
final List<L2Npc> npcList = new CopyOnWriteArrayList<>();
int darkChoirPlayerCount = 0;
FrintezzaSong OnSong = null;
ScheduledFuture<?> songTask = null;
ScheduledFuture<?> songEffectTask = null;
boolean isVideo = false;
L2Npc frintezzaDummy = null;
L2Npc overheadDummy = null;
L2Npc portraitDummy1 = null;
L2Npc portraitDummy3 = null;
L2Npc scarletDummy = null;
L2GrandBossInstance frintezza = null;
L2GrandBossInstance activeScarlet = null;
final List<L2MonsterInstance> demons = new CopyOnWriteArrayList<>();
final Map<L2MonsterInstance, Integer> portraits = new ConcurrentHashMap<>();
int scarlet_x = 0;
int scarlet_y = 0;
int scarlet_z = 0;
int scarlet_h = 0;
int scarlet_a = 0;
}
protected static class FETSpawn
static class FETSpawn
{
public boolean isZone = false;
public boolean isNeededNextFlag = false;
public int npcId;
public int x = 0;
public int y = 0;
public int z = 0;
public int h = 0;
public int zone = 0;
public int count = 0;
boolean isZone = false;
boolean isNeededNextFlag = false;
int npcId;
int x = 0;
int y = 0;
int z = 0;
int h = 0;
int zone = 0;
int count = 0;
}
private static class FrintezzaSong
@ -166,10 +166,9 @@ public final class FinalEmperialTomb extends AbstractInstance
// Skills
private static final int DEWDROP_OF_DESTRUCTION_SKILL_ID = 2276;
private static final int SOUL_BREAKING_ARROW_SKILL_ID = 2234;
protected static final SkillHolder INTRO_SKILL = new SkillHolder(5004, 1);
static final SkillHolder INTRO_SKILL = new SkillHolder(5004, 1);
private static final SkillHolder FIRST_MORPH_SKILL = new SkillHolder(5017, 1);
protected static final FrintezzaSong[] FRINTEZZASONGLIST =
static final FrintezzaSong[] FRINTEZZASONGLIST =
{
new FrintezzaSong(new SkillHolder(5007, 1), new SkillHolder(5008, 1), NpcStringId.REQUIEM_OF_HATRED, 5),
new FrintezzaSong(new SkillHolder(5007, 2), new SkillHolder(5008, 2), NpcStringId.RONDO_OF_SOLITUDE, 50),
@ -179,7 +178,7 @@ public final class FinalEmperialTomb extends AbstractInstance
};
// Locations
private static final Location ENTER_TELEPORT = new Location(-88015, -141153, -9168);
protected static final Location MOVE_TO_CENTER = new Location(-87904, -141296, -9168, 0);
static final Location MOVE_TO_CENTER = new Location(-87904, -141296, -9168, 0);
// Misc
private static final int TEMPLATE_ID = 136; // this is the client number
private static final int MIN_PLAYERS = 36;
@ -190,7 +189,7 @@ public final class FinalEmperialTomb extends AbstractInstance
private final Map<Integer, L2Territory> _spawnZoneList = new HashMap<>();
private final Map<Integer, List<FETSpawn>> _spawnList = new HashMap<>();
private final List<Integer> _mustKillMobsId = new ArrayList<>();
protected static final int[] FIRST_ROOM_DOORS =
static final int[] FIRST_ROOM_DOORS =
{
17130051,
17130052,
@ -201,7 +200,7 @@ public final class FinalEmperialTomb extends AbstractInstance
17130057,
17130058
};
protected static final int[] SECOND_ROOM_DOORS =
static final int[] SECOND_ROOM_DOORS =
{
17130061,
17130062,
@ -214,18 +213,18 @@ public final class FinalEmperialTomb extends AbstractInstance
17130069,
17130070
};
protected static final int[] FIRST_ROUTE_DOORS =
static final int[] FIRST_ROUTE_DOORS =
{
17130042,
17130043
};
protected static final int[] SECOND_ROUTE_DOORS =
static final int[] SECOND_ROUTE_DOORS =
{
17130045,
17130046
};
// @formatter:off
protected static final int[][] PORTRAIT_SPAWNS =
static final int[][] PORTRAIT_SPAWNS =
{
{29048, -89381, -153981, -9168, 3368, -89378, -153968, -9168, 3368},
{29048, -86234, -152467, -9168, 37656, -86261, -152492, -9168, 37656},
@ -560,7 +559,7 @@ public final class FinalEmperialTomb extends AbstractInstance
}
}
protected boolean checkKillProgress(L2Npc mob, FETWorld world)
private boolean checkKillProgress(L2Npc mob, FETWorld world)
{
if (world.npcList.contains(mob))
{
@ -608,7 +607,7 @@ public final class FinalEmperialTomb extends AbstractInstance
}
}
protected boolean controlStatus(FETWorld world)
boolean controlStatus(FETWorld world)
{
if (world.lock.tryLock())
{
@ -724,7 +723,7 @@ public final class FinalEmperialTomb extends AbstractInstance
return false;
}
protected void spawn(FETWorld world, int npcId, int x, int y, int z, int h, boolean addToKillTable)
private void spawn(FETWorld world, int npcId, int x, int y, int z, int h, boolean addToKillTable)
{
final L2Npc npc = addSpawn(npcId, x, y, z, h, false, 0, false, world.getInstanceId());
if (addToKillTable)
@ -1431,7 +1430,7 @@ public final class FinalEmperialTomb extends AbstractInstance
}
}
protected void broadCastPacket(FETWorld world, L2GameServerPacket packet)
void broadCastPacket(FETWorld world, L2GameServerPacket packet)
{
for (int objId : world.getAllowed())
{
@ -1443,7 +1442,7 @@ public final class FinalEmperialTomb extends AbstractInstance
}
}
protected void updateKnownList(FETWorld world, L2Npc npc)
void updateKnownList(FETWorld world, L2Npc npc)
{
final Map<Integer, L2PcInstance> npcKnownPlayers = npc.getKnownList().getKnownPlayers();
for (int objId : world.getAllowed())

24
trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java vendored
View File

@ -45,19 +45,19 @@ import instances.AbstractInstance;
*/
public final class HarnakUndergroundRuins extends AbstractInstance
{
protected class HuRWorld extends InstanceWorld
class HuRWorld extends InstanceWorld
{
protected int wave = 0;
protected int currentNpc = 0;
protected int waveNpcId = 0;
protected int maximalDefenseCounter = 0;
protected int timerCount = 0;
protected int enabledSeal = 0;
protected Set<L2Npc> spawnedNpc = Collections.newSetFromMap(new ConcurrentHashMap<L2Npc, Boolean>());
protected boolean openingPlayed = false;
protected boolean harnakMessage1 = false;
protected boolean harnakMessage2 = false;
protected boolean harnakMessage3 = false;
int wave = 0;
int currentNpc = 0;
int waveNpcId = 0;
int maximalDefenseCounter = 0;
int timerCount = 0;
int enabledSeal = 0;
final Set<L2Npc> spawnedNpc = Collections.newSetFromMap(new ConcurrentHashMap<L2Npc, Boolean>());
boolean openingPlayed = false;
boolean harnakMessage1 = false;
boolean harnakMessage2 = false;
boolean harnakMessage3 = false;
}
// NPCs

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

@ -30,7 +30,7 @@ import instances.AbstractInstance;
*/
public final class HideoutOfTheDawn extends AbstractInstance
{
protected class HotDWorld extends InstanceWorld
class HotDWorld extends InstanceWorld
{
}

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

@ -40,7 +40,7 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
*/
public final class IceQueensCastle extends AbstractInstance
{
protected class IQCWorld extends InstanceWorld
class IQCWorld extends InstanceWorld
{
L2PcInstance player = null;
}

22
trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java vendored
View File

@ -62,18 +62,18 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
*/
public final class IceQueensCastleBattle extends AbstractInstance
{
protected class IQCNBWorld extends InstanceWorld
class IQCNBWorld extends InstanceWorld
{
protected List<L2PcInstance> playersInside = new ArrayList<>();
protected List<L2Npc> knightStatues = new ArrayList<>();
protected List<L2Attackable> spawnedMobs = new CopyOnWriteArrayList<>();
protected L2NpcInstance controller = null;
protected L2GrandBossInstance freya = null;
protected L2QuestGuardInstance supp_Jinia = null;
protected L2QuestGuardInstance supp_Kegor = null;
protected boolean isSupportActive = false;
protected boolean canSpawnMobs = true;
protected boolean isHardCore = false;
final List<L2PcInstance> playersInside = new ArrayList<>();
final List<L2Npc> knightStatues = new ArrayList<>();
final List<L2Attackable> spawnedMobs = new CopyOnWriteArrayList<>();
L2NpcInstance controller = null;
L2GrandBossInstance freya = null;
L2QuestGuardInstance supp_Jinia = null;
L2QuestGuardInstance supp_Kegor = null;
boolean isSupportActive = false;
boolean canSpawnMobs = true;
boolean isHardCore = false;
}
// Npcs

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

@ -59,7 +59,7 @@ import instances.SanctumOftheLordsOfDawn.SanctumOftheLordsOfDawn;
* Instance class-loader.
* @author FallenAngel
*/
public final class InstanceLoader
final class InstanceLoader
{
private static final Logger _log = Logger.getLogger(InstanceLoader.class.getName());

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

@ -31,7 +31,7 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword;
*/
public final class JiniaGuildHideout1 extends AbstractInstance
{
protected class JGH1World extends InstanceWorld
class JGH1World extends InstanceWorld
{
}

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

@ -31,7 +31,7 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra;
*/
public final class JiniaGuildHideout2 extends AbstractInstance
{
protected class JGH2World extends InstanceWorld
class JGH2World extends InstanceWorld
{
}

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

@ -31,7 +31,7 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra;
*/
public final class JiniaGuildHideout3 extends AbstractInstance
{
protected class JGH3World extends InstanceWorld
class JGH3World extends InstanceWorld
{
}

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

@ -31,7 +31,7 @@ import quests.Q10287_StoryOfThoseLeft.Q10287_StoryOfThoseLeft;
*/
public final class JiniaGuildHideout4 extends AbstractInstance
{
protected class JGH4World extends InstanceWorld
class JGH4World extends InstanceWorld
{
}

16
trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java vendored
View File

@ -97,7 +97,7 @@ public final class Kamaloka extends AbstractInstance
* On retail only newbie guide buffs not removed<br>
* CAUTION: array must be sorted in ascension order!
*/
protected static final int[] BUFFS_WHITELIST =
private static final int[] BUFFS_WHITELIST =
{
4322, 4323, 4324, 4325, 4326, 4327, 4328, 4329, 4330, 4331, 5632, 5637, 5950
};
@ -1164,14 +1164,14 @@ public final class Kamaloka extends AbstractInstance
31340
};
protected class KamaWorld extends InstanceWorld
class KamaWorld extends InstanceWorld
{
public int index; // 0-18 index of the kama type in arrays
public int shaman = 0; // objectId of the shaman
public List<L2Spawn> firstRoom; // list of the spawns in the first room (excluding shaman)
public List<Integer> secondRoom;// list of objectIds mobs in the second room
public int miniBoss = 0; // objectId of the miniboss
public L2Npc boss = null; // boss
int index; // 0-18 index of the kama type in arrays
int shaman = 0; // objectId of the shaman
List<L2Spawn> firstRoom; // list of the spawns in the first room (excluding shaman)
List<Integer> secondRoom;// list of objectIds mobs in the second room
int miniBoss = 0; // objectId of the miniboss
L2Npc boss = null; // boss
}
public Kamaloka()

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

@ -40,7 +40,7 @@ public class KaraphonHabitat extends AbstractInstance
// Instance
private static final int TEMPLATE_ID = 253;
protected class KHWorld extends InstanceWorld
class KHWorld extends InstanceWorld
{
}

2
trunk/dist/game/data/scripts/instances/KartiasLabyrinth/AI/Healer.java vendored
View File

@ -29,7 +29,7 @@ import com.l2jmobius.util.Rnd;
/**
* @author Mobius
*/
public final class Healer implements Runnable
final class Healer implements Runnable
{
private L2PcInstance _player;
private final L2QuestGuardInstance _guard;

16
trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java vendored
View File

@ -129,15 +129,15 @@ public final class KartiasLabyrinth extends AbstractInstance
private static final String KARTIA_ENTRY_VAR = "Last_Kartia_entry";
private static final String KARTIA_PARTY_ENTRY_VAR = "Last_Kartia_party_entry";
protected class KartiaWorld extends InstanceWorld
class KartiaWorld extends InstanceWorld
{
protected L2QuestGuardInstance adolph = null;
protected L2QuestGuardInstance barton = null;
protected L2QuestGuardInstance hayuk = null;
protected L2QuestGuardInstance eliyah = null;
protected L2QuestGuardInstance elise = null;
protected List<L2PcInstance> playersInside = new ArrayList<>();
protected List<L2Npc> savedSpawns = new CopyOnWriteArrayList<>();
L2QuestGuardInstance adolph = null;
L2QuestGuardInstance barton = null;
L2QuestGuardInstance hayuk = null;
L2QuestGuardInstance eliyah = null;
L2QuestGuardInstance elise = null;
final List<L2PcInstance> playersInside = new ArrayList<>();
final List<L2Npc> savedSpawns = new CopyOnWriteArrayList<>();
}
public KartiasLabyrinth()

10
trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java vendored
View File

@ -81,12 +81,12 @@ public final class LabyrinthOfBelis extends AbstractInstance
private static final int DOOR_8 = 16240008;
private static final int DAMAGE_ZONE_ID = 10331;
protected class LOBWorld extends InstanceWorld
class LOBWorld extends InstanceWorld
{
protected L2QuestGuardInstance terian = null;
protected L2Npc generator = null;
protected List<L2Npc> savedSpawns = null;
protected boolean assistPlayer = false;
L2QuestGuardInstance terian = null;
L2Npc generator = null;
List<L2Npc> savedSpawns = null;
boolean assistPlayer = false;
}
public LabyrinthOfBelis()

4
trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java vendored
View File

@ -32,9 +32,9 @@ import instances.AbstractInstance;
*/
public final class LibraryOfSages extends AbstractInstance
{
protected class LoSWorld extends InstanceWorld
class LoSWorld extends InstanceWorld
{
protected L2Npc elcadia = null;
L2Npc elcadia = null;
}
// NPCs

10
trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java vendored
View File

@ -38,11 +38,6 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword;
*/
public final class MithrilMine extends AbstractInstance
{
protected class MMWorld extends InstanceWorld
{
protected int _count = 0;
}
// NPCs
private static final int KEGOR = 18846;
private static final int MITHRIL_MILLIPEDE = 22766;
@ -66,6 +61,11 @@ public final class MithrilMine extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 138;
class MMWorld extends InstanceWorld
{
int _count = 0;
}
public MithrilMine()
{
super(MithrilMine.class.getSimpleName(), "instances");

6
trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java vendored
View File

@ -33,9 +33,9 @@ import instances.AbstractInstance;
*/
public final class MonasteryOfSilence1 extends AbstractInstance
{
protected static final class MoSWorld extends InstanceWorld
static final class MoSWorld extends InstanceWorld
{
protected L2Npc elcadia = null;
L2Npc elcadia = null;
}
// NPCs
@ -194,7 +194,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance
return super.onTalk(npc, talker);
}
protected void spawnElcadia(L2PcInstance player, MoSWorld world)
private void spawnElcadia(L2PcInstance player, MoSWorld world)
{
if (world.elcadia != null)
{

6
trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java vendored
View File

@ -196,9 +196,9 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
private final HashMap<Integer, InstanceHolder> instanceWorlds = new HashMap<>();
public static class InstanceHolder
static class InstanceHolder
{
List<L2Npc> mobs = new ArrayList<>();
final List<L2Npc> mobs = new ArrayList<>();
}
private class MoSWorld2 extends InstanceWorld
@ -260,7 +260,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI
}
}
protected void enterInstance(L2Npc npc, L2PcInstance player)
private void enterInstance(L2Npc npc, L2PcInstance player)
{
InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
if (world != null)

10
trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java vendored
View File

@ -54,12 +54,12 @@ public final class MuseumDungeon extends AbstractInstance
private static final Location START_LOC = new Location(-114711, 243911, -7968);
private static final Location TOYRON_SPAWN_LOC = new Location(-114707, 245428, -7968);
protected class MDWorld extends InstanceWorld
class MDWorld extends InstanceWorld
{
protected L2QuestGuardInstance toyron = null;
protected List<L2Npc> deskSpawns = null;
protected List<L2Npc> thiefSpawns = null;
protected int randomDesk = 0;
L2QuestGuardInstance toyron = null;
List<L2Npc> deskSpawns = null;
List<L2Npc> thiefSpawns = null;
int randomDesk = 0;
}
public MuseumDungeon()

14
trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java vendored
View File

@ -43,13 +43,13 @@ import instances.AbstractInstance;
*/
public final class NornilsGarden extends AbstractInstance
{
protected class NornilsWorld extends InstanceWorld
class NornilsWorld extends InstanceWorld
{
protected L2Npc first_npc = null;
protected boolean spawned_1 = false;
protected boolean spawned_2 = false;
protected boolean spawned_3 = false;
protected boolean spawned_4 = false;
L2Npc first_npc = null;
boolean spawned_1 = false;
boolean spawned_2 = false;
boolean spawned_3 = false;
boolean spawned_4 = false;
}
// NPCs
@ -389,7 +389,7 @@ public final class NornilsGarden extends AbstractInstance
}
}
public void openDoor(QuestState st, L2PcInstance player, int doorId)
private void openDoor(QuestState st, L2PcInstance player, int doorId)
{
st.unset("correct");
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId());

6
trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java vendored
View File

@ -41,10 +41,10 @@ import quests.Q00129_PailakaDevilsLegacy.Q00129_PailakaDevilsLegacy;
*/
public final class PailakaDevilsLegacy extends AbstractInstance
{
protected class DIWorld extends InstanceWorld
class DIWorld extends InstanceWorld
{
protected L2Attackable _lematanNpc = null;
protected List<L2Attackable> _followerslist = new CopyOnWriteArrayList<>();
L2Attackable _lematanNpc = null;
final List<L2Attackable> _followerslist = new CopyOnWriteArrayList<>();
}
// NPCs

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

@ -34,7 +34,7 @@ import instances.AbstractInstance;
*/
public final class PailakaSongOfIceAndFire extends AbstractInstance
{
protected class PSoIWorld extends InstanceWorld
class PSoIWorld extends InstanceWorld
{
}

8
trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java vendored
View File

@ -43,12 +43,12 @@ import quests.Q00195_SevenSignsSecretRitualOfThePriests.Q00195_SevenSignsSecretR
*/
public final class SanctumOftheLordsOfDawn extends AbstractInstance
{
protected static final class HSWorld extends InstanceWorld
static final class HSWorld extends InstanceWorld
{
protected int doorst = 0;
protected final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
int doorst = 0;
final static Map<Integer, List<L2Npc>> _save_point = new HashMap<>();
public static Map<Integer, List<L2Npc>> getMonsters()
static Map<Integer, List<L2Npc>> getMonsters()
{
return _save_point;
}