From 3f34feecba66844c02aaabe8238d72b67ee7aa13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=AA=E9=A3=8E?= <1213457484@qq.com>
Date: Wed, 12 Mar 2025 22:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=91=E5=B8=81=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E7=88=86=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/MapleCharacter.java |  4 +++
 src/client/PlayerStats.java    | 56 +++++++++++++++++++---------------
 src/server/maps/MapleMap.java  |  5 +--
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java
index 2354ee8..6f8470c 100644
--- a/src/client/MapleCharacter.java
+++ b/src/client/MapleCharacter.java
@@ -6961,6 +6961,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
         return this.stats.dropMod;
     }
 
+    public int getcashMod() {
+        return this.stats.cashMod;
+    }
+
     public int getBs() {
         return this.stats.bs;
     }
diff --git a/src/client/PlayerStats.java b/src/client/PlayerStats.java
index 87d92ee..eb622ef 100644
--- a/src/client/PlayerStats.java
+++ b/src/client/PlayerStats.java
@@ -597,30 +597,7 @@ public class PlayerStats implements Serializable {
             }
         }
 
-        int bl = 0;
-        int jb = 0;
-        if (Start.blkg == 1){
-            for (BlConfig blConfig : Start.BLlist) {
-                if (blConfig.isInTimeRange()){
-                    boolean b = chra.haveItem(blConfig.getItem_id());
-                    if (b) {
-                        int itemNum = 1;
-                        if (blConfig.getStackableNum()== 1) {
-                            itemNum = chra.getItemNum(blConfig.getItem_id());
-                        }
-                        if (Start.bldj == 1) {
-                            bl += (blConfig.getItem_rate() * itemNum);
-                            jb += (blConfig.getGold_rate() * itemNum);
-                        }else {
-                            bl = bl>= (blConfig.getItem_rate() * itemNum)? bl : blConfig.getItem_rate() * itemNum;
-                            jb = jb>= (blConfig.getGold_rate() * itemNum)? jb : blConfig.getGold_rate() * itemNum;
-                        }
-                    }
-                }
-            }
-        }
-        this.dropMod+= bl/100;
-        this.cashMod+= jb/100;
+
 
 
 
@@ -647,6 +624,37 @@ public class PlayerStats implements Serializable {
                 }
             }
         }
+
+
+
+        int bl = 0;
+        int jb = 0;
+        if (Start.blkg == 1){
+            for (BlConfig blConfig : Start.BLlist) {
+                if (blConfig.isInTimeRange()){
+                    boolean b = chra.haveItem(blConfig.getItem_id());
+                    if (b) {
+                        int itemNum = 1;
+                        if (blConfig.getStackableNum()== 1) {
+                            itemNum = chra.getItemNum(blConfig.getItem_id());
+                        }
+                        if (Start.bldj == 1) {
+                            bl += (blConfig.getItem_rate() * itemNum);
+                            jb += (blConfig.getGold_rate() * itemNum);
+                        }else {
+                            bl = bl>= (blConfig.getItem_rate() * itemNum)? bl : blConfig.getItem_rate() * itemNum;
+                            jb = jb>= (blConfig.getGold_rate() * itemNum)? jb : blConfig.getGold_rate() * itemNum;
+                        }
+                    }
+                }
+            }
+        }
+        this.dropMod+= bl/100;
+
+        this.cashMod+= jb/100;
+
+
+
         for (final IItem item2 : chra.getInventory(MapleInventoryType.CASH)) {
             switch (item2.getItemId()) {
                 case 5062000: {
diff --git a/src/server/maps/MapleMap.java b/src/server/maps/MapleMap.java
index 7236770..7f44764 100644
--- a/src/server/maps/MapleMap.java
+++ b/src/server/maps/MapleMap.java
@@ -659,7 +659,7 @@ public final class MapleMap {
             }
             if (de2.itemId == 0) {
                 final int mesos = Randomizer.nextInt(1 + Math.abs(de2.Maximum - de2.Minimum)) + de2.Minimum;
-                int mmeos = (int) ((double) mesos * (chr.getStat().mesoBuff / 100.0) * (double) chr.getDropMod());
+                int mmeos = (int) ((double) mesos * (chr.getStat().mesoBuff / 100.0) * (double) chr.getcashMod());
                 if (((Integer) Start.ConfigValuesMap.get("金币重置")).intValue() < 1 && mmeos > 0) {
                     if (((Integer) Start.ConfigValuesMap.get("金币全局砍数量")).intValue() > 0) {
                         mmeos /= ((Integer) Start.ConfigValuesMap.get("金币砍全局倍率")).intValue();
@@ -732,7 +732,8 @@ public final class MapleMap {
                         break;
                     }
                 }
-                this.spawnMobMesoDrop((int) ((double) mesos2 * (lastMeso / 100.0) * ((double) (chr.getVipExpRate() / 100) + 1.0) * (double) chr.getDropMod() * chr.getDropm() * (double) cmServerrate), this.calcDropPos(pos, mob.getTruePosition()), (MapleMapObject) mob, chr, false, droptype);
+                double a = (double) mesos2 * (lastMeso / 100.0) * ((double) (chr.getVipExpRate() / 100) + 1.0) * (double) chr.getDropMod() * chr.getDropm() * (double) cmServerrate;
+                this.spawnMobMesoDrop((int) (a), this.calcDropPos(pos, mob.getTruePosition()), (MapleMapObject) mob, chr, false, droptype);
             }
         }
         if (chr.getEventInstance() == null) {