From f4344a96afe2e151378dc7a6a06571de807c4c56 Mon Sep 17 00:00:00 2001 From: RettichLP Date: Sun, 26 Apr 2026 13:41:42 +0200 Subject: [PATCH 1/2] fix: add delay to command execution and message handling for improved timing --- .../ucutils/command/faction/PersonalUseCommand.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java index 19c119da..b9bb0e5b 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java @@ -20,6 +20,7 @@ import static de.rettichlp.ucutils.UCUtils.configuration; import static de.rettichlp.ucutils.UCUtils.messageService; import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.utilService; import static java.lang.String.valueOf; import static java.util.regex.Pattern.compile; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; @@ -53,7 +54,7 @@ public LiteralArgumentBuilder execute(@NotNull Litera return 1; }))) .executes(context -> { - commandService.sendCommands(createCommands("dbank get %name% %amount% %purity%")); + commandService.sendCommands(createCommands("dbank get %name% %amount% %purity%"), 1000); return 1; }); } @@ -61,7 +62,7 @@ public LiteralArgumentBuilder execute(@NotNull Litera @Override public boolean onMessageReceive(Text text, String message) { if (DEAL_ACCEPTED.matcher(message).find() || DEAL_DECLINED.matcher(message).find()) { - removeAndExecuteFirst(); + utilService.delayedAction(this::removeAndExecuteFirst, 500); } return true; From 6a6cb487dd173066d0d5a32cb52d67ed30d90587 Mon Sep 17 00:00:00 2001 From: RettichLP Date: Sun, 26 Apr 2026 13:43:11 +0200 Subject: [PATCH 2/2] fix: add return statement to properly handle medic revive start logic --- .../rettichlp/ucutils/listener/impl/faction/MedicListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java index 6ab49038..ac7f21b0 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java @@ -66,6 +66,7 @@ public boolean onMessageReceive(Text text, String message) { Matcher medicReviveStartMatcher = MEDIC_REVIVE_START.matcher(message); if (medicReviveStartMatcher.find()) { utilService.delayedAction(() -> commandService.sendCommand("dinfo"), COMMAND_COOLDOWN_MILLIS); + return true; } Matcher housebanHeaderMatcher = HOUSEBAN_HEADER_PATTERN.matcher(message);