From 8dcef9431c299b93603fceda95ae6409f20bbb9f Mon Sep 17 00:00:00 2001 From: CarmJos Date: Sun, 13 Mar 2022 18:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/scriptitems/command/ScriptItemsCommand.java | 7 +++---- .../plugin/scriptitems/configuration/PluginMessages.java | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java b/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java index a99aa25..6c66c19 100644 --- a/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java +++ b/src/main/java/cc/carm/plugin/scriptitems/command/ScriptItemsCommand.java @@ -63,8 +63,7 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter { return true; } - ItemStack after = settings.applyItem(item); - player.getInventory().setItemInMainHand(after); + player.getInventory().setItemInMainHand(settings.applyItem(item.clone())); PluginMessages.APPLIED.send(sender, item.getType().name(), settings.getName()); return true; @@ -109,10 +108,10 @@ public class ScriptItemsCommand implements CommandExecutor, TabCompleter { HashMap remain = player.getInventory().addItem(item); if (remain.isEmpty()) { - PluginMessages.GIVEN_ALL.send(sender, player.getName(), item.getAmount(), settings.getName()); + PluginMessages.GIVEN_ALL.send(sender, player.getName(), amount, settings.getName()); } else { int remainAmount = remain.values().stream().mapToInt(ItemStack::getAmount).sum(); - PluginMessages.GIVEN_SOME.send(sender, player.getName(), item.getAmount() - remainAmount, settings.getName(), remainAmount); + PluginMessages.GIVEN_SOME.send(sender, player.getName(), amount - remainAmount, settings.getName(), remainAmount); } return true; diff --git a/src/main/java/cc/carm/plugin/scriptitems/configuration/PluginMessages.java b/src/main/java/cc/carm/plugin/scriptitems/configuration/PluginMessages.java index 97cba0d..39f20bb 100644 --- a/src/main/java/cc/carm/plugin/scriptitems/configuration/PluginMessages.java +++ b/src/main/java/cc/carm/plugin/scriptitems/configuration/PluginMessages.java @@ -18,7 +18,7 @@ public class PluginMessages extends MessagesRoot { public final static EasyMessageList COOLDOWN = EasyMessageList.builder() - .contents("&f您需要等待 &c%(time)秒 &f才可再次使用该物品。") + .contents("&f您需要等待 &a%(time)秒 &f才可再次使用该物品。") .params("time").build(); public final static EasyMessageList ONLY_PLAYER = EasyMessageList.builder() @@ -44,11 +44,11 @@ public class PluginMessages extends MessagesRoot { .build(); public final static EasyMessageList GIVEN_ALL = EasyMessageList.builder() - .contents("&f您成功给予 &a%(player) &f了 &a%(amount) &f个 &a%(name) &f。") + .contents("&f您成功给予 &2%(player) &f了 &a%(amount) &f个 &a%(name) &f。") .params("player", "amount", "name").build(); public final static EasyMessageList GIVEN_SOME = EasyMessageList.builder().contents( - "&f您成功给予 &a%(player) &f了 &a%(amount) &f个 &a%(name) &f。", + "&f您成功给予 &2%(player) &f了 &a%(amount) &f个 &a%(name) &f。", "&f但由于目标玩家背包已满，仍有 &a%(remain) &f个 &a%(name) &f未成功放入背包。" ).params("player", "amount", "name", "remain").build(); @@ -64,7 +64,7 @@ public class PluginMessages extends MessagesRoot { .build(); public final static EasyMessageList NOT_STARTED = EasyMessageList.builder() - .contents("&f该物品目前还到可使用的时间，请在 &c%(time) &f后使用~") + .contents("&f该物品目前还到可使用的时间，请在 &a%(time) &f后使用~") .params("time") .build();