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

no message

This commit is contained in:
雪风 2025-04-04 17:33:12 +08:00
parent 1f47588672
commit 1504fae066
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/PlayerStats.java
View File

@ -639,7 +639,7 @@ public class PlayerStats implements Serializable {
dsbbh++; dsbbh++;
if (!first_login) { if (!first_login) {
for (AotuNpc npc : Start.aotuNpcs) { for (AotuNpc npc : Start.aotuNpcs) {
if (npc.getMapId() == chra.getMapId() && (npc.getItemId() == 0 || chra.haveItem(npc.getItemId())) && (npc.getEquId() == 0 || chra.hasEquipped(npc.getEquId()))) { if ((npc.getMapId() == chra.getMapId()||npc.getMapId()==0) && (npc.getItemId() == 0 || chra.getItemNum(npc.getItemId())>=npc.getItemNum()) && (npc.getEquId() == 0 || chra.hasEquipped(npc.getEquId()))) {
Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS); Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS);
} }
} }
@ -985,7 +985,7 @@ public class PlayerStats implements Serializable {
private void dsnpcfw(MapleCharacter chra, AotuNpc aotuNpc,int dsbbh2) { private void dsnpcfw(MapleCharacter chra, AotuNpc aotuNpc,int dsbbh2) {
if (dsbbh2!=this.dsbbh)return; if (dsbbh2!=this.dsbbh)return;
if (aotuNpc.getMapId() == chra.getMapId() &&( aotuNpc.getItemId()==0 || chra.haveItem(aotuNpc.getItemId())) && (aotuNpc.getEquId()==0|| chra.hasEquipped(aotuNpc.getEquId()))) { if ((aotuNpc.getMapId() == chra.getMapId()||aotuNpc.getMapId()==0) && (aotuNpc.getItemId() == 0 || chra.getItemNum(aotuNpc.getItemId())>=aotuNpc.getItemNum()) && (aotuNpc.getEquId() == 0 || chra.hasEquipped(aotuNpc.getEquId()))) {
final NPCConversationManager cm = NPCScriptManager.getInstance().getCM(chra.getClient()); final NPCConversationManager cm = NPCScriptManager.getInstance().getCM(chra.getClient());
if (cm == null || chra.getConversation() == 0 || cm.getLastMsg() != 4) { if (cm == null || chra.getConversation() == 0 || cm.getLastMsg() != 4) {
NPCScriptManager.getInstance().startds(chra.getClient(), aotuNpc.getNpcId(),0,aotuNpc.getScriptsName()); NPCScriptManager.getInstance().startds(chra.getClient(), aotuNpc.getNpcId(),0,aotuNpc.getScriptsName());

9
src/gui/tw/AotuNpc.java
View File

@ -9,9 +9,18 @@ public class AotuNpc {
String scriptsName; String scriptsName;
int itemId; int itemId;
int itemNum;
int equId; int equId;
public int getItemNum() {
return itemNum;
}
public void setItemNum(int itemNum) {
this.itemNum = itemNum;
}
int time; int time;
public int getMapId() { public int getMapId() {

4
src/gui/tw/diaoyu/DiaoyuConfig.java
View File

@ -42,8 +42,8 @@ public class DiaoyuConfig {
diaoYuMap.setId(id); diaoYuMap.setId(id);
diaoYuMap.setMapId(mapId); diaoYuMap.setMapId(mapId);
diaoYuMap.setName(getMapStringName(mapId)); diaoYuMap.setName(MapleDataTool.getString("mapName", MapleMapFactory.nameData.getChildByPath(getMapStringName(910000000)), ""));
MapleDataTool.getString("mapName", MapleMapFactory.nameData.getChildByPath(getMapStringName(910000000)), "");
mapIds.add(diaoYuMap); mapIds.add(diaoYuMap);
} }
public void removemap(int id) { public void removemap(int id) {