Cleanup for previous commit.

This commit is contained in:
MobiusDev
2015-08-01 07:22:31 +00:00
parent 9112d2506d
commit ad08e5697c

View File

@@ -31,7 +31,6 @@ public class ExQuestNpcLogList extends L2GameServerPacket
{ {
private final int _questId; private final int _questId;
private final List<NpcLogListHolder> _npcLogList = new ArrayList<>(); private final List<NpcLogListHolder> _npcLogList = new ArrayList<>();
private boolean isNpcString = false;
public ExQuestNpcLogList(int questId) public ExQuestNpcLogList(int questId)
{ {
@@ -46,7 +45,6 @@ public class ExQuestNpcLogList extends L2GameServerPacket
public void addNpcString(NpcStringId npcStringId, int count) public void addNpcString(NpcStringId npcStringId, int count)
{ {
_npcLogList.add(new NpcLogListHolder(npcStringId.getId(), true, count)); _npcLogList.add(new NpcLogListHolder(npcStringId.getId(), true, count));
isNpcString = true;
} }
public void add(NpcLogListHolder holder) public void add(NpcLogListHolder holder)
@@ -63,14 +61,7 @@ public class ExQuestNpcLogList extends L2GameServerPacket
writeC(_npcLogList.size()); writeC(_npcLogList.size());
for (NpcLogListHolder holder : _npcLogList) for (NpcLogListHolder holder : _npcLogList)
{ {
if (isNpcString) writeD(holder.isNpcString() ? holder.getId() : holder.getId() + 1000000);
{
writeD(holder.getId());
}
else
{
writeD(holder.getId() + 1000000); // npc id in client quest data is normal npc id + 1000000
}
writeC(holder.isNpcString() ? 0x01 : 0x00); writeC(holder.isNpcString() ? 0x01 : 0x00);
writeD(holder.getCount()); writeD(holder.getCount());
} }