From 6c5cc79088d9c10b611cc71ad7c328ac3cec4867 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:27:29 +0800 Subject: [PATCH] Fix #353 --- patches/server/0010-Fakeplayer-support.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch index 7891cf08..39fa8944 100644 --- a/patches/server/0010-Fakeplayer-support.patch +++ b/patches/server/0010-Fakeplayer-support.patch @@ -626,10 +626,10 @@ index 4632eb883e9f5efde520ee543bcad25827c0da2c..d710803137a325f34e0628405d5ddfd0 return event; diff --git a/src/main/java/org/leavesmc/leaves/bot/BotCommand.java b/src/main/java/org/leavesmc/leaves/bot/BotCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..789ad3dd37baf80ac5597a37464cbbaceeb55d70 +index 0000000000000000000000000000000000000000..527f01b206dcf0e677ac7ec8c27ebf5fbc27a190 --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/bot/BotCommand.java -@@ -0,0 +1,543 @@ +@@ -0,0 +1,544 @@ +package org.leavesmc.leaves.bot; + +import net.kyori.adventure.text.Component; @@ -1014,7 +1014,7 @@ index 0000000000000000000000000000000000000000..789ad3dd37baf80ac5597a37464cbbac + System.arraycopy(args, 3, realArgs, 0, realArgs.length); + } + -+ BotAction newAction = null; ++ BotAction newAction; + try { + if (action instanceof CraftCustomBotAction customBotAction) { + newAction = customBotAction.createCraft(player, realArgs); @@ -1022,11 +1022,12 @@ index 0000000000000000000000000000000000000000..789ad3dd37baf80ac5597a37464cbbac + newAction = action.create(); + newAction.loadCommand(player.getHandle(), action.getArgument().parse(0, realArgs)); + } -+ } catch (IllegalArgumentException ignore) { ++ } catch (IllegalArgumentException e) { ++ sender.sendMessage(text("Action create error, please check your arguments, " + e.getMessage(), NamedTextColor.RED)); ++ return; + } + + if (newAction == null) { -+ sender.sendMessage(text("Action create error, please check your arguments", NamedTextColor.RED)); + return; + } +