src/client/MapleCharacter.java

@@ -2026,8 +2026,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
                             bl = Math.max(bl, (blobj.getBl()));
                         }
                     }
-                    long aa =  (long)num *bl;
+                    num = (num + (num*bl/100));
-                    num = (int) (num + (aa/100));
 
                     switch (item1.getItemId()) {
                         case 0:
@@ -5335,24 +5334,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject implements Se
 
             }
         }
-        BigInteger qg = this.getQG();
+        Num = Num.add((this.getQG()).divide(BigInteger.valueOf(100)));
-        if (qg!=null) {
+        Num = Num.add((this.getQGjs()).multiply(BigInteger.valueOf(100)));
-            Num = Num.add(qg.divide(BigInteger.valueOf(100)));
+        Num = Num.add((this.getDD()).multiply(BigInteger.valueOf(666)));
-        }
+        Num = Num.add((this.getDB()).multiply(BigInteger.valueOf(1000)));
-        BigInteger qgjs = this.getQGjs();
-        if (qgjs!=null) {
-            Num = Num.add(qgjs.divide(BigInteger.valueOf(100)));
-        }
-        BigInteger dd = this.getDD();
-        if (dd!=null) {
-            Num = Num.add(dd.divide(BigInteger.valueOf(666)));
-        }
-        BigInteger db = this.getDB();
-        if (db!=null) {
-            Num = Num.add(this.getDB().divide(BigInteger.valueOf(1000)));
-        }
-
-
         return DamageParse.process(Num.toString());
     }
 

src/client/PlayerStats.java

@@ -639,7 +639,9 @@ public class PlayerStats implements Serializable {
         dsbbh++;
         if (!first_login) {
             for (AotuNpc npc : Start.aotuNpcs) {
-                Start.executor.schedule(() -> dsnpcfw(chra, npc,dsbbh), npc.getTime(), TimeUnit.MILLISECONDS);
+                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);
+                }
             }
         }
 
@@ -983,12 +985,10 @@ public class PlayerStats implements Serializable {
 
     private void dsnpcfw(MapleCharacter chra, AotuNpc aotuNpc,int dsbbh2) {
         if (dsbbh2!=this.dsbbh)return;
-        if ((aotuNpc.getMapId() == chra.getMapId()||aotuNpc.getMapId()==0)) {
+        if ((aotuNpc.getMapId() == chra.getMapId()||aotuNpc.getMapId()==0) && (aotuNpc.getItemId() == 0 || chra.getItemNum(aotuNpc.getItemId())>=aotuNpc.getItemNum()) && (aotuNpc.getEquId() == 0 || chra.hasEquipped(aotuNpc.getEquId()))) {
-            if ((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());
-                }
             }
             Start.executor.schedule(()->dsnpcfw(chra,aotuNpc,dsbbh2), aotuNpc.getTime(), TimeUnit.MILLISECONDS);
         }

src/gui/tw/AotuNpc.java

@@ -13,8 +13,6 @@ public class AotuNpc {
 
     int equId;
 
-    int time;
-
     public int getItemNum() {
         return itemNum;
     }
@@ -23,7 +21,7 @@ public class AotuNpc {
         this.itemNum = itemNum;
     }
 
-
+    int time;
 
     public int getMapId() {
         return mapId;

src/gui/tw/rw/XuanShangRenWu.java

@@ -1,8 +1,6 @@
 package gui.tw.rw;
 
 import gui.Start;
-import provider.MapleDataTool;
-import server.life.MapleLifeFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,7 +53,6 @@ public class XuanShangRenWu {
     }
 
     public void setMobId(int mobId) {
-        this.setMobName(MapleDataTool.getString((this.getMobId() + "/name"), MapleLifeFactory.mobStringData, "未知怪物"));
         this.mobId = mobId;
     }
 

src/server/ShutdownServer.java

@@ -1,6 +1,5 @@
 package server;
 
-import java.io.IOException;
 import java.util.Set;
 import java.util.Iterator;
 
@@ -104,22 +103,6 @@ public class ShutdownServer implements Runnable, ShutdownServerMBean {
 
         System.out.println("[" + FileoutputUtil.CurrentReadable_Time() + "][信息]:服务端已经完全关闭了请点击右上角的xx按钮关闭.");
         System.out.println("[" + FileoutputUtil.CurrentReadable_Time() + "][========================================]");
-
-        String property = System.getProperty("user.dir");
-        String batFilePath = property+"\\启动.bat";
-        Process process = null;
-        try {
-            process = Runtime.getRuntime().exec("cmd /c start " + batFilePath);
-            int exitCode = process.waitFor();
-
-            System.exit(0);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-
-
     }
 
     @Override

src/server/maps/MapleMap.java

@@ -529,11 +529,7 @@ public final class MapleMap {
         for (MapleMonster mob : getAllMonstersThreadsafe()) {
             if (!mob.getStats().isBoss()) {
                 mob.setPosition(getChrPos());
-                try {
+                broadcastMessage(MobPacket.moveMonster(false, 0, 0, mob.getObjectId(), getChrPos(), mob.getPosition(), get吸怪Res()), mob.getPosition());
-                    broadcastMessage(MobPacket.moveMonster(false, 0, 0, mob.getObjectId(), getChrPos(), mob.getPosition(), get吸怪Res()), mob.getPosition());
-                }catch (Exception e){
-
-                }
             }
         }
     }