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

Updated raidboss status packets.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-10-31 10:30:21 +00:00
parent b0936e3095
commit a79b81de7b
6 changed files with 84 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/enums/RaidBossStatus.java
View File

@@ -21,7 +21,8 @@ package org.l2jmobius.gameserver.enums;
*/ */
public enum RaidBossStatus public enum RaidBossStatus
{ {
ALIVE,
DEAD, DEAD,
UNDEFINED ALIVE,
COMBAT,
UNDEFINED,
} }

42
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -16,13 +16,13 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo; package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo;
import java.util.ArrayList; import java.util.HashMap;
import java.util.List; import java.util.Map;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.instancemanager.DBSpawnManager; import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpawnInfo; import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpawnInfo;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa
*/ */
public class RequestRaidBossSpawnInfo implements IClientIncomingPacket public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
{ {
private final List<Integer> _bossIds = new ArrayList<>(); private final Map<Integer, Integer> _statuses = new HashMap<>();
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
@@ -41,18 +41,34 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
final int bossId = packet.readD(); final int bossId = packet.readD();
if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE) final GrandBossInstance boss = GrandBossManager.getInstance().getBoss(bossId);
if (boss == null)
{ {
_bossIds.add(bossId); final int status = DBSpawnManager.getInstance().getNpcStatusId(bossId).ordinal();
if (status != 3)
{
_statuses.put(bossId, status);
}
else
{
LOGGER.warning("Could not find spawn info for boss " + bossId + ".");
}
} }
else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0) else
{ {
_bossIds.add(bossId); if (boss.isDead() || !boss.isSpawned())
{
_statuses.put(bossId, 0);
}
else if (boss.isInCombat())
{
_statuses.put(bossId, 2);
}
else
{
_statuses.put(bossId, 1);
}
} }
/*
* else { String message = "Could not find spawn info for boss " + bossId; final NpcTemplate template = NpcData.getInstance().getTemplate(bossId); if (template != null) { message += " - " + template.getName() + "."; } else { message += " - NPC template not found."; }
* System.out.println(message); }
*/
} }
return true; return true;
} }
@@ -60,6 +76,6 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
client.sendPacket(new ExRaidBossSpawnInfo(_bossIds)); client.sendPacket(new ExRaidBossSpawnInfo(_statuses));
} }
} }

17
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -16,7 +16,8 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets.raidbossinfo; package org.l2jmobius.gameserver.network.serverpackets.raidbossinfo;
import java.util.List; import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -27,11 +28,11 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
*/ */
public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
{ {
private final List<Integer> _bossIds; private final Map<Integer, Integer> _statuses;
public ExRaidBossSpawnInfo(List<Integer> bossIds) public ExRaidBossSpawnInfo(Map<Integer, Integer> statuses)
{ {
_bossIds = bossIds; _statuses = statuses;
} }
@Override @Override
@@ -39,10 +40,12 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet);
packet.writeD(_bossIds.size()); // alive count packet.writeD(_statuses.size()); // count
for (int id : _bossIds) // alive ids for (Entry<Integer, Integer> entry : _statuses.entrySet())
{ {
packet.writeD(id); packet.writeD(entry.getKey());
packet.writeD(entry.getValue());
packet.writeD(0);
} }
return true; return true;
} }

5
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/enums/RaidBossStatus.java
View File

@@ -21,7 +21,8 @@ package org.l2jmobius.gameserver.enums;
*/ */
public enum RaidBossStatus public enum RaidBossStatus
{ {
ALIVE,
DEAD, DEAD,
UNDEFINED ALIVE,
COMBAT,
UNDEFINED,
} }

42
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/raidbossinfo/RequestRaidBossSpawnInfo.java
View File

@@ -16,13 +16,13 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo; package org.l2jmobius.gameserver.network.clientpackets.raidbossinfo;
import java.util.ArrayList; import java.util.HashMap;
import java.util.List; import java.util.Map;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.instancemanager.DBSpawnManager; import org.l2jmobius.gameserver.instancemanager.DBSpawnManager;
import org.l2jmobius.gameserver.instancemanager.GrandBossManager; import org.l2jmobius.gameserver.instancemanager.GrandBossManager;
import org.l2jmobius.gameserver.model.actor.instance.GrandBossInstance;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpawnInfo; import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpawnInfo;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.raidbossinfo.ExRaidBossSpa
*/ */
public class RequestRaidBossSpawnInfo implements IClientIncomingPacket public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
{ {
private final List<Integer> _bossIds = new ArrayList<>(); private final Map<Integer, Integer> _statuses = new HashMap<>();
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
@@ -41,18 +41,34 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
for (int i = 0; i < count; i++) for (int i = 0; i < count; i++)
{ {
final int bossId = packet.readD(); final int bossId = packet.readD();
if (DBSpawnManager.getInstance().getNpcStatusId(bossId) == RaidBossStatus.ALIVE) final GrandBossInstance boss = GrandBossManager.getInstance().getBoss(bossId);
if (boss == null)
{ {
_bossIds.add(bossId); final int status = DBSpawnManager.getInstance().getNpcStatusId(bossId).ordinal();
if (status != 3)
{
_statuses.put(bossId, status);
}
else
{
LOGGER.warning("Could not find spawn info for boss " + bossId + ".");
}
} }
else if (GrandBossManager.getInstance().getBossStatus(bossId) == 0) else
{ {
_bossIds.add(bossId); if (boss.isDead() || !boss.isSpawned())
{
_statuses.put(bossId, 0);
}
else if (boss.isInCombat())
{
_statuses.put(bossId, 2);
}
else
{
_statuses.put(bossId, 1);
}
} }
/*
* else { String message = "Could not find spawn info for boss " + bossId; final NpcTemplate template = NpcData.getInstance().getTemplate(bossId); if (template != null) { message += " - " + template.getName() + "."; } else { message += " - NPC template not found."; }
* System.out.println(message); }
*/
} }
return true; return true;
} }
@@ -60,6 +76,6 @@ public class RequestRaidBossSpawnInfo implements IClientIncomingPacket
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
client.sendPacket(new ExRaidBossSpawnInfo(_bossIds)); client.sendPacket(new ExRaidBossSpawnInfo(_statuses));
} }
} }

17
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/raidbossinfo/ExRaidBossSpawnInfo.java
View File

@@ -16,7 +16,8 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets.raidbossinfo; package org.l2jmobius.gameserver.network.serverpackets.raidbossinfo;
import java.util.List; import java.util.Map;
import java.util.Map.Entry;
import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -27,11 +28,11 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
*/ */
public class ExRaidBossSpawnInfo implements IClientOutgoingPacket public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
{ {
private final List<Integer> _bossIds; private final Map<Integer, Integer> _statuses;
public ExRaidBossSpawnInfo(List<Integer> bossIds) public ExRaidBossSpawnInfo(Map<Integer, Integer> statuses)
{ {
_bossIds = bossIds; _statuses = statuses;
} }
@Override @Override
@@ -39,10 +40,12 @@ public class ExRaidBossSpawnInfo implements IClientOutgoingPacket
{ {
OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet); OutgoingPackets.EX_RAID_BOSS_SPAWN_INFO.writeId(packet);
packet.writeD(_bossIds.size()); // alive count packet.writeD(_statuses.size()); // count
for (int id : _bossIds) // alive ids for (Entry<Integer, Integer> entry : _statuses.entrySet())
{ {
packet.writeD(id); packet.writeD(entry.getKey());
packet.writeD(entry.getValue());
packet.writeD(0);
} }
return true; return true;
} }