diff --git a/.gitignore b/.gitignore index 9a51576..e329461 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ out/ MXD-Server.iml 配置文件/事件载入.ini +配置文件/经验倍数.ini +配置文件/捉鬼任务.ini +配置文件/坐骑椅子.ini diff --git a/src/client/PlayerStats.java b/src/client/PlayerStats.java index 610f52a..5f9d136 100644 --- a/src/client/PlayerStats.java +++ b/src/client/PlayerStats.java @@ -633,17 +633,17 @@ public class PlayerStats implements Serializable { sxbl(chra); - if (!first_login) { - chra.jqxsrw(); - } - dsbbh++; -// if (!first_login) { -// for (AotuNpc npc : Start.aotuNpcs) { -// if (npc.getMapId() == chra.getMapId() && (npc.getItemId() == 0 || chra.haveItem(npc.getItemId())) && (npc.getEquId() == 0 || chra.hasEquipped(npc.getEquId()))) { -// Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS); -// } -// } +// if (!first_login) { +// chra.jqxsrw(); // } + dsbbh++; + if (!first_login) { + for (AotuNpc npc : Start.aotuNpcs) { + if (npc.getMapId() == chra.getMapId() && (npc.getItemId() == 0 || chra.haveItem(npc.getItemId())) && (npc.getEquId() == 0 || chra.hasEquipped(npc.getEquId()))) { + Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS); + } + } + } for (final IItem item2 : chra.getInventory(MapleInventoryType.CASH)) { diff --git a/src/tools/packet/PacketHelper.java b/src/tools/packet/PacketHelper.java index e6082ad..0c61343 100644 --- a/src/tools/packet/PacketHelper.java +++ b/src/tools/packet/PacketHelper.java @@ -482,7 +482,7 @@ public class PacketHelper { mplew.writeUTF8(equip.getdd()); mplew.writeUTF8(equip.getdb()); mplew.writeUTF8(equip.getqg()); - mplew.writeUTF8(equip.getqgjs()); +// mplew.writeUTF8(equip.getqgjs()); } else { mplew.writeShort((int) item.getQuantity()); mplew.writeMapleAsciiString(item.getOwner());