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

Better naming from raidboss status getter and setter.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-12 09:15:47 +00:00
parent 1f164b009c
commit 38366a9017
440 changed files with 1992 additions and 1992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java vendored
View File

@@ -53,11 +53,11 @@ public class Leona extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
if (player.isGM())
{
player.teleToLocation(ENTER_LOC, true);
GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
}
else
{
@@ -106,7 +106,7 @@ public class Leona extends AbstractNpcAI
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ENTER_LOC, false);
GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
}
}
}

4
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/Giran/Kekropus/Kekropus.java vendored
View File

@@ -69,7 +69,7 @@ public class Kekropus extends AbstractNpcAI
}
case "helios":
{
final int status = GrandBossManager.getInstance().getBossStatus(HELIOS);
final int status = GrandBossManager.getInstance().getStatus(HELIOS);
if (player.isGM())
{
player.teleToLocation(RAID_ENTER_LOC, true);
@@ -132,7 +132,7 @@ public class Kekropus extends AbstractNpcAI
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(HELIOS, WAITING);
GrandBossManager.getInstance().setStatus(HELIOS, WAITING);
heliosAI().startQuestTimer("beginning", Config.HELIOS_WAIT_TIME * 60000, null, null);
}
break;

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/areas/KeucereusAllianceBase/Erda/Erda.java vendored
View File

@@ -51,11 +51,11 @@ public class Erda extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(ETINA_RAID);
final int status = GrandBossManager.getInstance().getStatus(ETINA_RAID);
if (player.isGM())
{
player.teleToLocation(ENTER_LOC, true);
GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
}
else
{
@@ -104,7 +104,7 @@ public class Erda extends AbstractNpcAI
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ENTER_LOC, false);
GrandBossManager.getInstance().setBossStatus(ETINA_RAID, 1);
GrandBossManager.getInstance().setStatus(ETINA_RAID, 1);
}
}
}

4
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -642,7 +642,7 @@ public class Baium extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(BAIUM);
return GrandBossManager.getInstance().getStatus(BAIUM);
}
private void addBoss(GrandBoss grandboss)
@@ -652,7 +652,7 @@ public class Baium extends AbstractNpcAI
private void setStatus(int status)
{
GrandBossManager.getInstance().setBossStatus(BAIUM, status);
GrandBossManager.getInstance().setStatus(BAIUM, status);
}
private void setRespawn(long respawnTime)

16
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Beleth.java vendored
View File

@@ -105,7 +105,7 @@ public class Beleth extends AbstractNpcAI
addTalkId(STONE_COFFIN);
addFirstTalkId(ELF);
final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
final int status = GrandBossManager.getInstance().getBossStatus(REAL_BELETH);
final int status = GrandBossManager.getInstance().getStatus(REAL_BELETH);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -115,12 +115,12 @@ public class Beleth extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
}
DoorData.getInstance().getDoor(DOOR1).openMe();
}
@@ -132,7 +132,7 @@ public class Beleth extends AbstractNpcAI
{
case "BELETH_UNLOCK":
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
DoorData.getInstance().getDoor(DOOR1).openMe();
break;
}
@@ -509,7 +509,7 @@ public class Beleth extends AbstractNpcAI
{
if ((_lastAttack + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, ALIVE);
GrandBossManager.getInstance().setStatus(REAL_BELETH, ALIVE);
for (Creature creature : ZONE.getCharactersInside())
{
if (creature != null)
@@ -539,7 +539,7 @@ public class Beleth extends AbstractNpcAI
@Override
public String onEnterZone(Creature creature, ZoneType zone)
{
if (creature.isPlayer() && (GrandBossManager.getInstance().getBossStatus(REAL_BELETH) < FIGHT))
if (creature.isPlayer() && (GrandBossManager.getInstance().getStatus(REAL_BELETH) < FIGHT))
{
if (_priest != null)
{
@@ -550,7 +550,7 @@ public class Beleth extends AbstractNpcAI
_stone.deleteMe();
}
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, FIGHT);
GrandBossManager.getInstance().setStatus(REAL_BELETH, FIGHT);
startQuestTimer("SPAWN1", Config.BELETH_WAIT_TIME * 60 * 1000, null, null);
}
@@ -705,7 +705,7 @@ public class Beleth extends AbstractNpcAI
{
cancelQuestTimer("CHECK_ATTACK", null, null);
setBelethKiller(killer);
GrandBossManager.getInstance().setBossStatus(REAL_BELETH, DEAD);
GrandBossManager.getInstance().setStatus(REAL_BELETH, DEAD);
final long respawnTime = (Config.BELETH_SPAWN_INTERVAL + getRandom(-Config.BELETH_SPAWN_RANDOM, Config.BELETH_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(REAL_BELETH);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

2
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Beleth/Wormhole/Wormhole.java vendored
View File

@@ -53,7 +53,7 @@ public class Wormhole extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(BELETH);
final int status = GrandBossManager.getInstance().getStatus(BELETH);
if (status == 1)
{
return "33901-4.html";

10
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@@ -84,7 +84,7 @@ public class Core extends AbstractNpcAI
_firstAttacked = false;
final StatSet info = GrandBossManager.getInstance().getStatSet(CORE);
if (GrandBossManager.getInstance().getBossStatus(CORE) == DEAD)
if (GrandBossManager.getInstance().getStatus(CORE) == DEAD)
{
// Load the unlock date and time for Core from DB.
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -97,7 +97,7 @@ public class Core extends AbstractNpcAI
{
// The time has already expired while the server was offline. Immediately spawn Core.
final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
GrandBossManager.getInstance().setStatus(CORE, ALIVE);
spawnBoss(core);
}
}
@@ -148,7 +148,7 @@ public class Core extends AbstractNpcAI
if (event.equalsIgnoreCase("core_unlock"))
{
final GrandBoss core = (GrandBoss) addSpawn(CORE, 17726, 108915, -6480, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(CORE, ALIVE);
GrandBossManager.getInstance().setStatus(CORE, ALIVE);
spawnBoss(core);
}
else if (event.equalsIgnoreCase("spawn_minion"))
@@ -198,7 +198,7 @@ public class Core extends AbstractNpcAI
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.EMPTY);
_firstAttacked = false;
GrandBossManager.getInstance().setBossStatus(CORE, DEAD);
GrandBossManager.getInstance().setStatus(CORE, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.CORE_SPAWN_INTERVAL + getRandom(-Config.CORE_SPAWN_RANDOM, Config.CORE_SPAWN_RANDOM)) * 3600000;
startQuestTimer("core_unlock", respawnTime, null, null);
@@ -209,7 +209,7 @@ public class Core extends AbstractNpcAI
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}
else if ((GrandBossManager.getInstance().getBossStatus(CORE) == ALIVE) && _minions.contains(npc))
else if ((GrandBossManager.getInstance().getStatus(CORE) == ALIVE) && _minions.contains(npc))
{
_minions.remove(npc);
startQuestTimer("spawn_minion", 60000, npc, null);

24
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java vendored
View File

@@ -328,7 +328,7 @@ public class EtisVanEtina extends AbstractNpcAI
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
final int status = GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1);
final int status = GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -338,12 +338,12 @@ public class EtisVanEtina extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
}
}
else
{
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
}
}
@@ -354,16 +354,16 @@ public class EtisVanEtina extends AbstractNpcAI
{
case "unlock_etina":
{
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
break;
}
case "check_activity_task":
{
if ((_lastAction + 900000) < System.currentTimeMillis())
{
if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE)
if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
}
for (Creature creature : BOSS_ZONE.getCharactersInside())
{
@@ -381,7 +381,7 @@ public class EtisVanEtina extends AbstractNpcAI
}
startQuestTimer("end_etina", 2000, null, null);
}
else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
else if (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == FIGHTING)
{
startQuestTimer("check_activity_task", 60000, null, null);
}
@@ -505,9 +505,9 @@ public class EtisVanEtina extends AbstractNpcAI
closeDoor(DOOR2, 0);
closeDoor(DOOR3, 0);
closeDoor(DOOR4, 0);
if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) != ALIVE))
if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != DEAD) && (GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) != ALIVE))
{
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, ALIVE);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, ALIVE);
}
}
@@ -680,7 +680,7 @@ public class EtisVanEtina extends AbstractNpcAI
_collapseTask.cancel(true);
_collapseTask = null;
}
if ((GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
if ((GrandBossManager.getInstance().getStatus(ETIS_VAN_ETINA1) == WAITING) && !_spawned)
{
_spawned = true;
_spawns.clear();
@@ -696,7 +696,7 @@ public class EtisVanEtina extends AbstractNpcAI
_paragon = (Monster) addSpawn(PARAGON, PARAGON_LOC);
_paragon.setInvul(true);
BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, FIGHTING);
_lastAction = System.currentTimeMillis();
startQuestTimer("check_activity_task", 60000, null, null);
}
@@ -726,7 +726,7 @@ public class EtisVanEtina extends AbstractNpcAI
{
notifyEvent("cancel_timers", null, null);
BOSS_ZONE.getPlayersInside().forEach(player -> playMovie(player, Movie.SC_ETIS_VAN_ETINA_ENDING));
GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, DEAD);
GrandBossManager.getInstance().setStatus(ETIS_VAN_ETINA1, DEAD);
final long respawnTime = (Config.ETINA_SPAWN_INTERVAL + getRandom(-Config.ETINA_SPAWN_RANDOM, Config.ETINA_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(ETIS_VAN_ETINA1);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

22
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Fafurion/Fafurion.java vendored
View File

@@ -81,7 +81,7 @@ public class Fafurion extends AbstractNpcAI
addKillId(FAFURION_STAGE_1, FAFURION_STAGE_2, FAFURION_STAGE_3, FAFURION_STAGE_4, FAFURION_STAGE_5, FAFURION_STAGE_6, FAFURION_STAGE_7);
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -93,14 +93,14 @@ public class Fafurion extends AbstractNpcAI
{
final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(fafurion);
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
}
}
else
{
final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(fafurion);
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
}
}
@@ -114,7 +114,7 @@ public class Fafurion extends AbstractNpcAI
{
final GrandBoss fafurion = (GrandBoss) addSpawn(FAFURION_GRANDBOSS_ID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(fafurion);
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
break;
}
case "warning":
@@ -131,7 +131,7 @@ public class Fafurion extends AbstractNpcAI
}
case "beginning":
{
if (GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID) == WAITING)
if (GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID) == WAITING)
{
// checking fafurion stage.
_stage = GlobalVariablesManager.getInstance().getInt("Fafurion_Stage", 1);
@@ -139,7 +139,7 @@ public class Fafurion extends AbstractNpcAI
{
playMovie(p, Movie.SC_FAFURION_INTRO);
});
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, FIGHTING);
switch (_stage)
{
case 1:
@@ -184,14 +184,14 @@ public class Fafurion extends AbstractNpcAI
}
case "resetRaid":
{
final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
if ((status > ALIVE) && (status < DEAD))
{
for (Player plr : World.getInstance().getVisibleObjectsInRange(npc, Player.class, 5000))
{
plr.sendPacket(new ExShowScreenMessage(NpcStringId.FAFURION_S_NEST_RAID_IS_OVER, ExShowScreenMessage.TOP_CENTER, 10000, true));
}
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, ALIVE);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, ALIVE);
FAFURION_ZONE.oustAllPlayers();
npc.deleteMe();
if (_stage > 1)
@@ -204,7 +204,7 @@ public class Fafurion extends AbstractNpcAI
}
case "enter_area":
{
final int status = GrandBossManager.getInstance().getBossStatus(FAFURION_GRANDBOSS_ID);
final int status = GrandBossManager.getInstance().getStatus(FAFURION_GRANDBOSS_ID);
if (player.isGM())
{
player.teleToLocation(RAID_ENTER_LOC, true);
@@ -263,7 +263,7 @@ public class Fafurion extends AbstractNpcAI
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, WAITING);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, WAITING);
startQuestTimer("beginning", Config.FAFURION_WAIT_TIME * 60000, null, null);
startQuestTimer("warning", Config.FAFURION_WAIT_TIME > 0 ? (Config.FAFURION_WAIT_TIME * 60000) - 30000 : 0, null, player);
}
@@ -446,7 +446,7 @@ public class Fafurion extends AbstractNpcAI
p.sendPacket(new ExShowScreenMessage(NpcStringId.HONORED_WARRIORS_HAVE_DEFEATED_THE_WATER_DRAGON_FAFURION, ExShowScreenMessage.TOP_CENTER, 20000, true));
});
GrandBossManager.getInstance().setBossStatus(FAFURION_GRANDBOSS_ID, DEAD);
GrandBossManager.getInstance().setStatus(FAFURION_GRANDBOSS_ID, DEAD);
final long respawnTime = (Config.FAFURION_SPAWN_INTERVAL + getRandom(-Config.FAFURION_SPAWN_RANDOM, Config.FAFURION_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(FAFURION_GRANDBOSS_ID);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

18
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Helios/Helios.java vendored
View File

@@ -147,7 +147,7 @@ public class Helios extends AbstractNpcAI
_bossZone = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -159,14 +159,14 @@ public class Helios extends AbstractNpcAI
{
_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_tempHelios);
GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
}
}
else
{
_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_tempHelios);
GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
}
}
@@ -329,14 +329,14 @@ public class Helios extends AbstractNpcAI
{
_tempHelios = (GrandBoss) addSpawn(HELIOS3, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_tempHelios);
GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
break;
}
case "beginning":
{
if (GrandBossManager.getInstance().getBossStatus(HELIOS3) == WAITING)
if (GrandBossManager.getInstance().getStatus(HELIOS3) == WAITING)
{
GrandBossManager.getInstance().setBossStatus(HELIOS3, FIGHTING);
GrandBossManager.getInstance().setStatus(HELIOS3, FIGHTING);
_bossInstance = addSpawn(HELIOS1, HELIOS_SPAWN_LOC.getX(), HELIOS_SPAWN_LOC.getY(), HELIOS_SPAWN_LOC.getZ(), HELIOS_SPAWN_LOC.getHeading(), false, 0, false);
for (SpawnHolder spawn : SPAWNS_MINIONS)
{
@@ -348,12 +348,12 @@ public class Helios extends AbstractNpcAI
}
case "resetRaid":
{
final int status = GrandBossManager.getInstance().getBossStatus(HELIOS3);
final int status = GrandBossManager.getInstance().getStatus(HELIOS3);
if ((status > ALIVE) && (status < DEAD))
{
_bossZone.oustAllPlayers();
Broadcast.toAllOnlinePlayers(new ExShowScreenMessage(NpcStringId.THE_HEROES_DRAINED_OF_THEIR_POWERS_HAVE_BEEN_BANISHED_FROM_THE_THRONE_OF_HELIOS_BY_HELIOS_POWERS, ExShowScreenMessage.TOP_CENTER, 10000, true));
GrandBossManager.getInstance().setBossStatus(HELIOS3, ALIVE);
GrandBossManager.getInstance().setStatus(HELIOS3, ALIVE);
clean();
}
break;
@@ -481,7 +481,7 @@ public class Helios extends AbstractNpcAI
{
clean();
_bossZone.broadcastPacket(new ExShowScreenMessage(NpcStringId.HELIOS_DEFEATED_TAKES_FLIGHT_DEEP_IN_TO_THE_SUPERION_FORT_HIS_THRONE_IS_RENDERED_INACTIVE, ExShowScreenMessage.TOP_CENTER, 10000, true));
GrandBossManager.getInstance().setBossStatus(HELIOS3, DEAD);
GrandBossManager.getInstance().setStatus(HELIOS3, DEAD);
final long respawnTime = (Config.HELIOS_SPAWN_INTERVAL + getRandom(-Config.HELIOS_SPAWN_RANDOM, Config.HELIOS_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(HELIOS3);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

18
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java vendored
View File

@@ -117,7 +117,7 @@ public class Kelbim extends AbstractNpcAI
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
final int status = GrandBossManager.getInstance().getStatus(KELBIM);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -129,14 +129,14 @@ public class Kelbim extends AbstractNpcAI
{
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
}
}
else if (status != ALIVE)
{
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
}
}
@@ -147,7 +147,7 @@ public class Kelbim extends AbstractNpcAI
{
case "unlock_kelbim":
{
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
Broadcast.toAllOnlinePlayers(new Earthquake(-55754, 59903, -269, 20, 10));
openDoor(DOOR1, 0);
openDoor(DOOR2, 0);
@@ -157,7 +157,7 @@ public class Kelbim extends AbstractNpcAI
{
if ((_lastAction + 900000) < System.currentTimeMillis())
{
GrandBossManager.getInstance().setBossStatus(KELBIM, ALIVE);
GrandBossManager.getInstance().setStatus(KELBIM, ALIVE);
for (Creature creature : ZONE.getCharactersInside())
{
if (creature != null)
@@ -183,7 +183,7 @@ public class Kelbim extends AbstractNpcAI
case "stage_1_start":
{
_bossStage = 1;
GrandBossManager.getInstance().setBossStatus(KELBIM, FIGHTING);
GrandBossManager.getInstance().setStatus(KELBIM, FIGHTING);
playMovie(ZONE.getPlayersInside(), Movie.SC_KELBIM_OPENING);
startQuestTimer("stage_1_kelbim_spawn", 25000, null, null);
break;
@@ -307,7 +307,7 @@ public class Kelbim extends AbstractNpcAI
{
if (npc.getId() == ENTER_DEVICE)
{
final int status = GrandBossManager.getInstance().getBossStatus(KELBIM);
final int status = GrandBossManager.getInstance().getStatus(KELBIM);
if (status > ALIVE)
{
return "34052-1.html";
@@ -349,7 +349,7 @@ public class Kelbim extends AbstractNpcAI
{
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
GrandBossManager.getInstance().setStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
@@ -430,7 +430,7 @@ public class Kelbim extends AbstractNpcAI
notifyEvent("cancel_timers", null, null);
closeDoor(DOOR1, 0);
closeDoor(DOOR2, 0);
GrandBossManager.getInstance().setBossStatus(KELBIM, DEAD);
GrandBossManager.getInstance().setStatus(KELBIM, DEAD);
final long respawnTime = (Config.KELBIM_SPAWN_INTERVAL + getRandom(-Config.KELBIM_SPAWN_RANDOM, Config.KELBIM_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(KELBIM);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java vendored
View File

@@ -53,12 +53,12 @@ public class KatoSicanus extends AbstractNpcAI
{
if (event.equals("teleport"))
{
final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
if (player.isGM())
{
player.teleToLocation(LINDVIOR_LOCATION, true);
addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 60000, false);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
}
else
{
@@ -115,7 +115,7 @@ public class KatoSicanus extends AbstractNpcAI
{
member.teleToLocation(LINDVIOR_LOCATION, true);
addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, 1);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, 1);
}
}
}

16
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java vendored
View File

@@ -223,7 +223,7 @@ public class Lindvior extends AbstractNpcAI
_zoneLair = ZoneManager.getInstance().getZoneById(ZONE_ID, NoSummonFriendZone.class);
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID);
final int status = GrandBossManager.getInstance().getStatus(LINDVIOR_RAID);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -235,14 +235,14 @@ public class Lindvior extends AbstractNpcAI
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
else
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
@@ -428,9 +428,9 @@ public class Lindvior extends AbstractNpcAI
_zoneLair.oustAllPlayers();
_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, false));
cancelQuestTimers("attack_generator");
if (GrandBossManager.getInstance().getBossStatus(LINDVIOR_RAID) != 3)
if (GrandBossManager.getInstance().getStatus(LINDVIOR_RAID) != 3)
{
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
}
}
@@ -660,7 +660,7 @@ public class Lindvior extends AbstractNpcAI
cancelQuestTimers("attack_generator");
_lindviorfake.setDead(true);
_lindviorfake.deleteMe();
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, FIGHTING);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, FIGHTING);
_lionel = addSpawn(LIONEL_HUNTER, 42630, -48231, -792, 855, false, 0, false);
_lindvior = (GrandBoss) addSpawn(LINDVIOR_GROUND, CENTER_LOCATION, false, 0, true);
@@ -682,7 +682,7 @@ public class Lindvior extends AbstractNpcAI
{
_lindviorForSpawn = (GrandBoss) addSpawn(LINDVIOR_RAID, -126920, -234182, -15563, 0, false, 0);
GrandBossManager.getInstance().addBoss(_lindviorForSpawn);
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, ALIVE);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, ALIVE);
break;
}
case "stage_1_activate_generator":
@@ -851,7 +851,7 @@ public class Lindvior extends AbstractNpcAI
_zoneLair.broadcastPacket(new OnEventTrigger(FIRST_STAGE_EVENT_TRIGGER, true));
_lionel.deleteMe();
GrandBossManager.getInstance().setBossStatus(LINDVIOR_RAID, DEAD);
GrandBossManager.getInstance().setStatus(LINDVIOR_RAID, DEAD);
final long respawnTime = (Config.LINDVIOR_SPAWN_INTERVAL + getRandom(-Config.LINDVIOR_SPAWN_RANDOM, Config.LINDVIOR_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(LINDVIOR_RAID);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

10
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java vendored
View File

@@ -84,7 +84,7 @@ public class Orfen extends AbstractNpcAI
};
registerMobs(mobs);
final StatSet info = GrandBossManager.getInstance().getStatSet(ORFEN);
final int status = GrandBossManager.getInstance().getBossStatus(ORFEN);
final int status = GrandBossManager.getInstance().getStatus(ORFEN);
if (status == DEAD)
{
// load the unlock date and time for Orfen from DB
@@ -99,7 +99,7 @@ public class Orfen extends AbstractNpcAI
{
// the time has already expired while the server was offline. Immediately spawn Orfen.
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
}
@@ -146,7 +146,7 @@ public class Orfen extends AbstractNpcAI
if (event.equalsIgnoreCase("orfen_unlock"))
{
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, POS, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
else if (event.equalsIgnoreCase("check_minion_loc"))
@@ -302,7 +302,7 @@ public class Orfen extends AbstractNpcAI
if (npc.getId() == ORFEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(ORFEN, DEAD);
GrandBossManager.getInstance().setStatus(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;
@@ -315,7 +315,7 @@ public class Orfen extends AbstractNpcAI
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}
else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == ARIMA))
{
_minions.remove(npc);
startQuestTimer("spawn_minion", 360000, npc, null);

8
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java vendored
View File

@@ -47,7 +47,7 @@ public class QueenAnt extends AbstractNpcAI
addKillId(QUEEN_ANT);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN_ANT);
if (GrandBossManager.getInstance().getBossStatus(QUEEN_ANT) == DEAD)
if (GrandBossManager.getInstance().getStatus(QUEEN_ANT) == DEAD)
{
// Load the unlock date and time for queen ant from DB.
final long temp = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -58,7 +58,7 @@ public class QueenAnt extends AbstractNpcAI
else // The time has already expired while the server was offline. Immediately spawn queen ant.
{
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
spawnBoss(queen);
}
}
@@ -88,7 +88,7 @@ public class QueenAnt extends AbstractNpcAI
if ("queen_unlock".equals(event))
{
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN_ANT, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN_ANT, ALIVE);
spawnBoss(queen);
}
return super.onAdvEvent(event, npc, player);
@@ -98,7 +98,7 @@ public class QueenAnt extends AbstractNpcAI
public String onKill(Npc npc, Player killer, boolean isSummon)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(QUEEN_ANT, DEAD);
GrandBossManager.getInstance().setStatus(QUEEN_ANT, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.QUEEN_ANT_SPAWN_INTERVAL + getRandom(-Config.QUEEN_ANT_SPAWN_RANDOM, Config.QUEEN_ANT_SPAWN_RANDOM)) * 3600000;

6
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java vendored
View File

@@ -54,11 +54,11 @@ public class Daichir extends AbstractNpcAI
{
if (event.equals("enterEarthWyrnCave"))
{
final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
if (player.isGM())
{
player.teleToLocation(ENTER_LOCATION, true);
GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
}
else
{
@@ -107,7 +107,7 @@ public class Daichir extends AbstractNpcAI
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ENTER_LOCATION, true);
GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);
GrandBossManager.getInstance().setStatus(TRASKEN, FIGHTING);
}
}
}

12
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Trasken/Trasken.java vendored
View File

@@ -324,7 +324,7 @@ public class Trasken extends AbstractNpcAI
}
// Unlock
final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
final int status = GrandBossManager.getInstance().getBossStatus(TRASKEN);
final int status = GrandBossManager.getInstance().getStatus(TRASKEN);
if (status == DEAD)
{
final long time = info.getLong("respawn_time") - System.currentTimeMillis();
@@ -334,12 +334,12 @@ public class Trasken extends AbstractNpcAI
}
else
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
}
else if (status != ALIVE)
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
}
@@ -398,7 +398,7 @@ public class Trasken extends AbstractNpcAI
}
_zoneLair.oustAllPlayers();
_zoneLair2.oustAllPlayers();
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
}
@Override
@@ -575,7 +575,7 @@ public class Trasken extends AbstractNpcAI
{
case "unlock_trasken":
{
GrandBossManager.getInstance().setBossStatus(TRASKEN, ALIVE);
GrandBossManager.getInstance().setStatus(TRASKEN, ALIVE);
break;
}
case "exitEarthWyrnCave":
@@ -604,7 +604,7 @@ public class Trasken extends AbstractNpcAI
ThreadPool.schedule(npc::decayMe, 10000);
cancelQuestTimer("finish", npc, null);
GrandBossManager.getInstance().setBossStatus(TRASKEN, DEAD);
GrandBossManager.getInstance().setStatus(TRASKEN, DEAD);
final long respawnTime = (Config.TRASKEN_SPAWN_INTERVAL + getRandom(-Config.TRASKEN_SPAWN_RANDOM, Config.TRASKEN_SPAWN_RANDOM)) * 3600000;
final StatSet info = GrandBossManager.getInstance().getStatSet(TRASKEN);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);

16
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java vendored
View File

@@ -124,7 +124,7 @@ public class Valakas extends AbstractNpcAI
ZONE = ZoneManager.getInstance().getZoneById(12010);
final StatSet info = GrandBossManager.getInstance().getStatSet(VALAKAS);
final int status = GrandBossManager.getInstance().getBossStatus(VALAKAS);
final int status = GrandBossManager.getInstance().getStatus(VALAKAS);
if (status == DEAD)
{
@@ -140,7 +140,7 @@ public class Valakas extends AbstractNpcAI
// The time has expired while the server was offline. Spawn valakas in his cave as DORMANT.
final Npc valakas = addSpawn(VALAKAS, VALAKAS_REGENERATION_LOC, false, 0);
valakas.teleToLocation(VALAKAS_HIDDEN_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
valakas.setInvul(true);
@@ -220,12 +220,12 @@ public class Valakas extends AbstractNpcAI
else if (event.equalsIgnoreCase("regen_task"))
{
// Inactivity task - 15min
if ((GrandBossManager.getInstance().getBossStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
if ((GrandBossManager.getInstance().getStatus(VALAKAS) == FIGHTING) && ((_timeTracker + 900000) < System.currentTimeMillis()))
{
npc.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
npc.teleToLocation(VALAKAS_REGENERATION_LOC);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
// Drop all players from the zone.
@@ -313,7 +313,7 @@ public class Valakas extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("spawn_10"))
{
GrandBossManager.getInstance().setBossStatus(VALAKAS, FIGHTING);
GrandBossManager.getInstance().setStatus(VALAKAS, FIGHTING);
npc.setInvul(false);
startQuestTimer("regen_task", 60000, npc, null, true);
@@ -372,7 +372,7 @@ public class Valakas extends AbstractNpcAI
valakas.setRunning();
valakas.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
GrandBossManager.getInstance().addBoss((GrandBoss) valakas);
GrandBossManager.getInstance().setBossStatus(VALAKAS, DORMANT);
GrandBossManager.getInstance().setStatus(VALAKAS, DORMANT);
}
else if (event.equalsIgnoreCase("remove_players"))
{
@@ -404,7 +404,7 @@ public class Valakas extends AbstractNpcAI
return null;
}
if (GrandBossManager.getInstance().getBossStatus(VALAKAS) != FIGHTING)
if (GrandBossManager.getInstance().getStatus(VALAKAS) != FIGHTING)
{
attacker.teleToLocation(ATTACKER_REMOVE);
return null;
@@ -441,7 +441,7 @@ public class Valakas extends AbstractNpcAI
startQuestTimer("die_7", 14000, npc, null); // 700
startQuestTimer("die_8", 16500, npc, null); // 2500
GrandBossManager.getInstance().setBossStatus(VALAKAS, DEAD);
GrandBossManager.getInstance().setStatus(VALAKAS, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.VALAKAS_SPAWN_INTERVAL + getRandom(-Config.VALAKAS_SPAWN_RANDOM, Config.VALAKAS_SPAWN_RANDOM)) * 3600000;
startQuestTimer("valakas_unlock", respawnTime, null, null);

4
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/ai/others/ValakasTeleporters/ValakasTeleporters.java vendored
View File

@@ -90,7 +90,7 @@ public class ValakasTeleporters extends AbstractNpcAI
{
if (valakasAI() != null)
{
final int status = GrandBossManager.getInstance().getBossStatus(29028);
final int status = GrandBossManager.getInstance().getStatus(29028);
if ((status == 0) || (status == 1))
{
if (playerCount >= 200)
@@ -107,7 +107,7 @@ public class ValakasTeleporters extends AbstractNpcAI
{
final GrandBoss valakas = GrandBossManager.getInstance().getBoss(29028);
valakasAI().startQuestTimer("beginning", Config.VALAKAS_WAIT_TIME * 60000, valakas, null);
GrandBossManager.getInstance().setBossStatus(29028, 1);
GrandBossManager.getInstance().setStatus(29028, 1);
}
}
else

2
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -159,7 +159,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (Arrays.asList(VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId))
{
final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId);
final int bossStatus = GrandBossManager.getInstance().getStatus(grandBossId);
NoRestartZone bossZone = null;
String textColor = null;
String text = null;

6
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -505,11 +505,11 @@ public class DBSpawnManager
}
/**
* Gets the raid npc status id.
* Gets the raid npc status.
* @param npcId the npc id
* @return the raid npc status id
* @return the raid npc status
*/
public RaidBossStatus getNpcStatusId(int npcId)
public RaidBossStatus getStatus(int npcId)
{
if (_npcs.containsKey(npcId))
{

4
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
View File

@@ -107,7 +107,7 @@ public class GrandBossManager implements IStorable
ThreadPool.scheduleAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
}
public int getBossStatus(int bossId)
public int getStatus(int bossId)
{
if (!_bossStatus.containsKey(bossId))
{
@@ -116,7 +116,7 @@ public class GrandBossManager implements IStorable
return _bossStatus.get(bossId);
}
public void setBossStatus(int bossId, int status)
public void setStatus(int bossId, int status)
{
_bossStatus.put(bossId, status);
LOGGER.info(getClass().getSimpleName() + ": Updated " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status to " + status + ".");

4
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -48,7 +48,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
final GrandBoss boss = GrandBossManager.getInstance().getBoss(bossId);
if (boss == null)
{
final RaidBossStatus status = DBSpawnManager.getInstance().getNpcStatusId(bossId);
final RaidBossStatus status = DBSpawnManager.getInstance().getStatus(bossId);
if (status != RaidBossStatus.UNDEFINED)
{
final Npc npc = DBSpawnManager.getInstance().getNpc(bossId);
@@ -71,7 +71,7 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
{
if (boss.isDead() || !boss.isSpawned())
{
if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0))
if ((bossId == BAIUM) && (GrandBossManager.getInstance().getStatus(BAIUM) == 0))
{
_statuses.put(bossId, RaidBossStatus.ALIVE);
}