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

Reduce checks for Baium info by moving it to clientpacket.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-12 08:45:59 +00:00
parent b4814a917b
commit 1f164b009c
16 changed files with 88 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

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

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;

11
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _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())
{

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -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<Integer, RaidBossStatus> _statuses;
@@ -47,7 +45,7 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
for (Entry<Integer, RaidBossStatus> 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;