Skip to content

Commit e14ffd3

Browse files
committed
3.1.1 修复 3.0.0的展示物品为空报错问题
1 parent f4a1e39 commit e14ffd3

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/main/java/cn/handyplus/chat/listener/PlayerItemChatListener.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import cn.handyplus.lib.util.BaseUtil;
1818
import cn.handyplus.lib.util.BcUtil;
1919
import cn.handyplus.lib.util.ItemStackUtil;
20+
import cn.handyplus.lib.util.MessageUtil;
2021
import org.bukkit.Bukkit;
22+
import org.bukkit.Material;
2123
import org.bukkit.entity.Player;
2224
import org.bukkit.event.EventHandler;
2325
import org.bukkit.event.EventPriority;
@@ -64,6 +66,10 @@ public void onItemChat(AsyncPlayerChatEvent event) {
6466
}
6567
// 获取物品参数
6668
ItemStack itemInMainHand = ItemStackUtil.getItemInMainHand(player.getInventory());
69+
if (itemInMainHand == null || Material.AIR.equals(itemInMainHand.getType())) {
70+
MessageUtil.sendMessage(player, BaseUtil.getMsgNotColor("notAirItem"));
71+
return;
72+
}
6773
ItemMeta itemMeta = ItemStackUtil.getItemMeta(itemInMainHand);
6874

6975
// 存储数据

src/main/java/cn/handyplus/chat/util/ConfigUtil.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ public static void upConfig() {
9393
HandyConfigUtil.setPathIsNotContains(BaseConstants.LANG_CONFIG, "timeFormatFailureMsg", "&8[&c✘&8] &7时间格式错误, 支持: 数字(秒), 1m(分钟), 1h(小时), 1d(天), 1w(周), 1M(月), 1y(年)", null, language);
9494
HandyConfigUtil.setPathIsNotContains(BaseConstants.LANG_CONFIG, "mutedNotifyMsg", "&8[&c✘&8] &7你已被禁言 ${time} 秒, 原因: ${reason}", null, language);
9595
HandyConfigUtil.setPathIsNotContains(BaseConstants.LANG_CONFIG, "unmutedNotifyMsg", "&8[&a✔&8] &a你的禁言已被解除", null, language);
96+
// 3.1.1 添加展示物品为空提醒
97+
HandyConfigUtil.setPathIsNotContains(BaseConstants.LANG_CONFIG, "notAirItem", "&8[&c✘&8] &7展示物品为空", null, language);
9698
HandyConfigUtil.loadLangConfig(true);
9799
// 1.0.7 添加聊天频率配置和黑名单配置
98100
HandyConfigUtil.setPathIsNotContains(BaseConstants.CONFIG, "blacklist", Arrays.asList("操", "草", "cao"), Collections.singletonList("黑名单,关键字替换成*"), "config.yml");

src/main/resources/languages/zh_CN.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ voteSuccessMsg: "&8[&a✔&8] &7投票成功,当前票数&a${number}&7/&a${max}"
5656
hasVotedMsg: "&8[&a✔&8] &7您已投票,当前票数&a${number}&7/&a${max}"
5757
aiTip: "&8[&a!&8] &7请文明发言,多次违规将禁言!"
5858
nickSetSuccessMsg: "&8[&a✔&8] &a已成功设置玩家 ${player} 的昵称为 ${nickName}"
59+
notAirItem: "&8[&c✘&8] &7展示物品为空"
5960

6061
# 禁言相关
6162
muteParamFailureMsg: "&8[&c✘&8] &7参数错误 使用方法: &a/plc mute [玩家名] [时长] (原因)"

0 commit comments

Comments
 (0)