From a05a719557bbb9b3d6b1119bd6561cc0c1b80425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E9=A3=8E?= <1213457484@qq.com>
Date: Wed, 16 Apr 2025 17:59:34 +0800
Subject: [PATCH] no message

---
 src/client/MapleCharacter.java      | 19 ++++++++++---------
 src/gui/tw/diaoyu/DiaoyuConfig.java | 13 ++++++++++++-
 src/scripting/NPCScriptManager.java |  4 ++--
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java
index d83f30a..d38f2d8 100644
--- a/src/client/MapleCharacter.java
+++ b/src/client/MapleCharacter.java
@@ -2011,12 +2011,14 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
                     int bl = 0;
 
                     for (BL blobj : bls) {
-//                        int itemNum = 1;
-                        if (Start.diaoyuConfig.getBldj()== 1) {
-//                            itemNum = MapleCharacter.this.getItemNum(blobj.getItemId());
-                            bl += (blobj.getBl());
-                        }else {
-                            bl = Math.max(bl, (blobj.getBl()));
+                        boolean b = MapleCharacter.this.haveItem(blobj.getItemId());
+                        if (b) {
+                            if (Start.diaoyuConfig.getBldj() == 1) {
+//                                int itemNum = MapleCharacter.this.getItemNum(blobj.getItemId());
+                                bl += (blobj.getBl());
+                            } else {
+                                bl = Math.max(bl, (blobj.getBl()));
+                            }
                         }
                     }
                     long aa =  (long)num *bl;
@@ -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));
                         }
-
-
                     }
 
                 }
diff --git a/src/gui/tw/diaoyu/DiaoyuConfig.java b/src/gui/tw/diaoyu/DiaoyuConfig.java
index decb8d5..33692dd 100644
--- a/src/gui/tw/diaoyu/DiaoyuConfig.java
+++ b/src/gui/tw/diaoyu/DiaoyuConfig.java
@@ -85,7 +85,18 @@ public class DiaoyuConfig {
 
     public void add(DiaoyuItem item) {
         All.add(item);
-        item.setItemName(MapleItemInformationProvider.getInstance().getName(item.getItemId()));
+        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());
diff --git a/src/scripting/NPCScriptManager.java b/src/scripting/NPCScriptManager.java
index 9176101..36fce30 100644
--- a/src/scripting/NPCScriptManager.java
+++ b/src/scripting/NPCScriptManager.java
@@ -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));
             }