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

4
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Antharas/Antharas.java vendored
View File

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

4
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Baium/Baium.java vendored
View File

@@ -649,7 +649,7 @@ public class Baium extends AbstractNpcAI
private int getStatus()
{
return GrandBossManager.getInstance().getBossStatus(BAIUM);
return GrandBossManager.getInstance().getStatus(BAIUM);
}
private void addBoss(GrandBoss grandboss)
@@ -659,7 +659,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)

10
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Core/Core.java vendored
View File

@@ -83,7 +83,7 @@ public class Core extends AbstractNpcAI
registerMobs(CORE, DEATH_KNIGHT, DOOM_WRAITH, SUSCEPTOR);
_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();
@@ -96,7 +96,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);
}
}
@@ -147,7 +147,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"))
@@ -196,7 +196,7 @@ public class Core extends AbstractNpcAI
npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.SYSTEM_IS_BEING_SHUT_DOWN);
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);
@@ -207,7 +207,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);

10
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java vendored
View File

@@ -93,7 +93,7 @@ public class Orfen extends AbstractNpcAI
_isTeleported = false;
_zone = ZoneManager.getInstance().getZoneById(12013);
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
@@ -122,7 +122,7 @@ public class Orfen extends AbstractNpcAI
loc = POS[3];
}
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
}
@@ -193,7 +193,7 @@ public class Orfen extends AbstractNpcAI
loc = POS[3];
}
final GrandBoss orfen = (GrandBoss) addSpawn(ORFEN, loc, false, 0);
GrandBossManager.getInstance().setBossStatus(ORFEN, ALIVE);
GrandBossManager.getInstance().setStatus(ORFEN, ALIVE);
spawnBoss(orfen);
}
else if (event.equalsIgnoreCase("check_orfen_pos"))
@@ -321,7 +321,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;
@@ -335,7 +335,7 @@ public class Orfen extends AbstractNpcAI
startQuestTimer("despawn_minions", 20000, null, null);
cancelQuestTimers("spawn_minion");
}
else if ((GrandBossManager.getInstance().getBossStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
else if ((GrandBossManager.getInstance().getStatus(ORFEN) == ALIVE) && (npc.getId() == RAIKEL_LEOS))
{
_minions.remove(npc);
startQuestTimer("spawn_minion", 360000, npc, null);

8
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java vendored
View File

@@ -92,7 +92,7 @@ public class QueenAnt extends AbstractNpcAI
_zone = ZoneManager.getInstance().getZoneById(12012);
final StatSet info = GrandBossManager.getInstance().getStatSet(QUEEN);
final int status = GrandBossManager.getInstance().getBossStatus(QUEEN);
final int status = GrandBossManager.getInstance().getStatus(QUEEN);
if (status == DEAD)
{
// load the unlock date and time for queen ant from DB
@@ -107,7 +107,7 @@ public class QueenAnt extends AbstractNpcAI
{
// the time has already expired while the server was offline. Immediately spawn queen ant.
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
spawnBoss(queen);
}
}
@@ -221,7 +221,7 @@ public class QueenAnt extends AbstractNpcAI
case "queen_unlock":
{
final GrandBoss queen = (GrandBoss) addSpawn(QUEEN, QUEEN_X, QUEEN_Y, QUEEN_Z, 0, false, 0);
GrandBossManager.getInstance().setBossStatus(QUEEN, ALIVE);
GrandBossManager.getInstance().setStatus(QUEEN, ALIVE);
spawnBoss(queen);
break;
}
@@ -359,7 +359,7 @@ public class QueenAnt extends AbstractNpcAI
if (npcId == QUEEN)
{
npc.broadcastPacket(new PlaySound(1, "BS02_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
GrandBossManager.getInstance().setBossStatus(QUEEN, DEAD);
GrandBossManager.getInstance().setStatus(QUEEN, 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;
startQuestTimer("queen_unlock", respawnTime, null, null);

6
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/ai/bosses/Zaken/Zaken.java vendored
View File

@@ -50,7 +50,7 @@ public class Zaken extends AbstractNpcAI
addKillId(ZAKEN);
final StatSet info = GrandBossManager.getInstance().getStatSet(ZAKEN);
final int status = GrandBossManager.getInstance().getBossStatus(ZAKEN);
final int status = GrandBossManager.getInstance().getStatus(ZAKEN);
if (status == DEAD)
{
// load the unlock date and time from DB
@@ -83,7 +83,7 @@ public class Zaken extends AbstractNpcAI
private void spawnBoss()
{
final GrandBoss zaken = (GrandBoss) addSpawn(ZAKEN, ZAKEN_X, ZAKEN_Y, ZAKEN_Z, ZAKEN_HEADING, false, 0);
GrandBossManager.getInstance().setBossStatus(ZAKEN, ALIVE);
GrandBossManager.getInstance().setStatus(ZAKEN, ALIVE);
GrandBossManager.getInstance().addBoss(zaken);
zaken.broadcastPacket(new PlaySound(1, "BS01_A", 1, zaken.getObjectId(), zaken.getX(), zaken.getY(), zaken.getZ()));
}
@@ -92,7 +92,7 @@ public class Zaken 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(ZAKEN, DEAD);
GrandBossManager.getInstance().setStatus(ZAKEN, DEAD);
// Calculate Min and Max respawn times randomly.
final long respawnTime = (Config.ZAKEN_SPAWN_INTERVAL + getRandom(-Config.ZAKEN_SPAWN_RANDOM, Config.ZAKEN_SPAWN_RANDOM)) * 3600000;
startQuestTimer("zaken_unlock", respawnTime, null, null);

2
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java vendored
View File

@@ -200,7 +200,7 @@ public class AdminGrandBoss implements IAdminCommandHandler
{
if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).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_Essence_6.1_BattleChronicle/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_Essence_6.1_BattleChronicle/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_Essence_6.1_BattleChronicle/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);
}

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
View File

@@ -77,12 +77,12 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_raidId);
if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getBossStatus(_raidId) != 0))
if (template.isType("GrandBoss") && (GrandBossManager.getInstance().getStatus(_raidId) != 0))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
return;
}
else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getNpcStatusId(_raidId) != RaidBossStatus.ALIVE))
else if (template.isType("RaidBoss") && (DBSpawnManager.getInstance().getStatus(_raidId) != RaidBossStatus.ALIVE))
{
player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_RIGHT_NOW);
return;