From 2421d26bc5a44e14f597935a3f78055d1c6c12c1 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 4 Jan 2024 17:42:30 +0800 Subject: [PATCH] =?UTF-8?q?gm=20=E5=88=A0=E9=99=A4=E9=81=93=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/kefu/Cmd_general.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java index 6d1181fc9..3870f4763 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java @@ -6,6 +6,7 @@ import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityType; +import com.ljsd.jieling.logic.dao.Item; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.family.GuildLogic; @@ -56,9 +57,15 @@ public class Cmd_general extends GmAbstract { String[] split = args[2].split("\\|"); for (String s : split) { String[] strings = s.split("#"); - map.put(Integer.parseInt(strings[0]),Long.parseLong(strings[1])); + int id = Integer.parseInt(strings[0]); + Item item = user.getItemManager().getItem(id); + if (item == null || item.getItemNum() == 0){ + continue; + } + long num = Math.min(item.getItemNum(), Long.parseLong(strings[1])); + map.put(id,num); } - ItemUtil.useItemLong(user,map, BIReason.GM_ROOT_REMOVE_ITEM,-999); + ItemUtil.itemCostLong(user, map, BIReason.GM_ROOT_REMOVE_ITEM,-999); LOGGER.info("通过gm后台删除玩家道具,uid:{},item:{}",uid, map); } catch (Exception e) { e.printStackTrace();