From b421aad6bbf83fa690390630eacf4f84eb508b50 Mon Sep 17 00:00:00 2001 From: Ziggy Date: Fri, 15 Apr 2022 22:38:38 +0200 Subject: [PATCH] Fixed behavior where client never dequeued successful commands, because the server only did that in case the command failed --- .../support/global/commands/CommandQueueService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java b/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java index 48619f0ad..12010b682 100644 --- a/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java +++ b/src/main/java/com/projectswg/holocore/services/support/global/commands/CommandQueueService.java @@ -147,13 +147,11 @@ public class CommandQueueService extends Service { startCooldownGroup(command.getSource(), rootCommand, rootCommand.getCooldownGroup2(), rootCommand.getCooldownTime2(), command.getCounter()); } startCooldownGroup(command.getSource(), rootCommand, rootCommand.getCooldownGroup(), rootCommand.getCooldownTime(), command.getCounter()); - } else { - sendQueueRemove(command, error); } ExecuteCommandIntent.broadcast(command.getSource(), command.getTarget(), command.getArguments(), command.getCommand()); - } else { - sendQueueRemove(command, error); } + + sendQueueRemove(command, error); } private void sendQueueRemove(EnqueuedCommand command, ErrorCode error) {