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-16 17:59:34 +08:00
parent 179fd3a745
commit a05a719557
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/MapleCharacter.java
View File

@ -2011,14 +2011,16 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
int bl = 0;
for (BL blobj : bls) {
// int itemNum = 1;
boolean b = MapleCharacter.this.haveItem(blobj.getItemId());
if (b) {
if (Start.diaoyuConfig.getBldj() == 1) {
// itemNum = MapleCharacter.this.getItemNum(blobj.getItemId());
// int itemNum = MapleCharacter.this.getItemNum(blobj.getItemId());
bl += (blobj.getBl());
} else {
bl = Math.max(bl, (blobj.getBl()));
}
}
}
long aa = (long)num *bl;
num = (int) (num + (aa/100));
@ -2069,10 +2071,9 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
}else {
d = num + item1.getItemName();
String replace = Start.diaoyuConfig.getNotice().replace("%s", s).replace("%d", d);
World.Broadcast.broadcastMessage(MaplePacketCreator.serverNotice(6, replace));
replace = "【钓鱼场】 : "+replace;
Broadcast.broadcastMessage(MaplePacketCreator.serverNotice(9, MapleCharacter.this.client.getChannel(),replace));
}
}
}

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

@ -85,7 +85,18 @@ public class DiaoyuConfig {
public void add(DiaoyuItem item) {
All.add(item);
if (item.getItemId()>0) {
item.setItemName(MapleItemInformationProvider.getInstance().getName(item.getItemId()));
}else if (item.getItemId() == 0){
item.setItemName("金币");
}else if (item.getItemId() ==-1){
item.setItemName("经验");
}else if (item.getItemId() == -2){
item.setItemName("抵用券");
}else if (item.getItemId() == -3){
item.setItemName("点券");
}
if (item.getChance()>0){
item.setChance2(item.getChance());

4
src/scripting/NPCScriptManager.java
View File

@ -120,12 +120,12 @@ public class NPCScriptManager extends AbstractScriptManager {
c.sendPacket(MaplePacketCreator.enableActions());
}
} catch (ScriptException ex) {
c.getPlayer().dropMessage(6, "NPC 脚本错误2, 它ID为 : " + npc + "_" + ((script == null) ? "" : ("(" + script + ")")) + ((mode == 0) ? "" : ("型号: " + mode)) + "." + ex);
c.getPlayer().dropMessage(5, "NPC 脚本错误2, 它ID为 : " + npc + "_" + ((script == null) ? "" : ("(" + script + ")")) + ((mode == 0) ? "" : ("型号: " + mode)) + "." + ex);
// System.err.println("NPC 脚本错误2, 它ID为 : " + npc + "_" + ((script == null) ? "" : ("(" + script + ")")) + ((mode == 0) ? "" : ("型号: " + mode)) + "." + ex);
c.removeClickedNPC();
NPCScriptManager.getInstance().dispose(c);
c.getSession().write(MaplePacketCreator.enableActions());
c.getPlayer().dropMessage(1, "你已假死，已为你自动解卡");
c.getPlayer().dropMessage(5, "你已假死，已为你自动解卡");
if (c.getPlayer().isAdmin()) {
c.getPlayer().getMap().broadcastMessage(MaplePacketCreator.boatEffect(1034));
}