From 1f164b009cbc7322ac1b31147e0bf4e4778b3e69 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 12 Jul 2022 08:45:59 +0000 Subject: [PATCH] Reduce checks for Baium info by moving it to clientpacket. --- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- .../raidbossinfo/RequestRaidBossSpawnInfo.java | 11 ++++++++++- .../raidbossinfo/ExRaidBossSpawnInfo.java | 4 +--- 16 files changed, 88 insertions(+), 32 deletions(-) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true; diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java index fe0b6eea57..342ddc4466 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java @@ -34,6 +34,8 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa */ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { + private static final int BAIUM = 29020; + private final Map _statuses = new HashMap<>(); @Override @@ -69,7 +71,14 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket { if (boss.isDead() || !boss.isSpawned()) { - _statuses.put(bossId, RaidBossStatus.DEAD); + if ((bossId == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0)) + { + _statuses.put(bossId, RaidBossStatus.ALIVE); + } + else + { + _statuses.put(bossId, RaidBossStatus.DEAD); + } } else if (boss.isInCombat()) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java index 60499f65fa..31bca3fd66 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java @@ -21,7 +21,6 @@ import java.util.Map.Entry; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.RaidBossStatus; -import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; @@ -30,7 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; */ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket { - private static final int BAIUM = 29020; private final Map _statuses; @@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket for (Entry entry : _statuses.entrySet()) { packet.writeD(entry.getKey()); - packet.writeD((entry.getKey() == BAIUM) && (GrandBossManager.getInstance().getBossStatus(BAIUM) == 0) ? 1 : entry.getValue().ordinal()); + packet.writeD(entry.getValue().ordinal()); packet.writeD(0); } return true;