Lenheart
/
MXD-Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lenheart:d80e69fc91758890e77cfb1c06cc2d361a85dfc5
Branches Tags
Lenheart:master
Lenheart:z
..
compare: Lenheart:3da8d6e3248c85c8287f5fb3366b2a0a7a61337e
Branches Tags
Lenheart:master
Lenheart:z

No commits in common. "d80e69fc91758890e77cfb1c06cc2d361a85dfc5" and "3da8d6e3248c85c8287f5fb3366b2a0a7a61337e" have entirely different histories.
d80e69fc91 ... 3da8d6e324

3 changed files with 10 additions and 17 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,6 +2,3 @@
out/
MXD-Server.iml
配置文件/事件载入.ini
配置文件/经验倍数.ini
配置文件/捉鬼任务.ini
配置文件/坐骑椅子.ini

20
src/client/PlayerStats.java
View File

@ -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)) {

4
src/gui/特殊控制台.java
View File

@ -1158,10 +1158,6 @@ public class 特殊控制台 extends JFrame {
jsonObject4.put("npc", JSON.toJSONString(Start.aotuNpcs));
fileWriter.write(jsonObject4.toString());
fileWriter = new FileWriter(new File(property + "\\配置文件\\悬赏任务.ini"));
JSONObject jsonObject5 = new JSONObject();
jsonObject5.put("rw", JSON.toJSONString(Start.xsRWConfig));
fileWriter.write(jsonObject5.toString());
}