From 6f1612c0461b91b6a1a679033aa5e1e1ac9001bc Mon Sep 17 00:00:00 2001 From: Peyang Date: Mon, 1 May 2023 16:24:27 +0900 Subject: [PATCH] fix: Exclusion op --- .../net/kunmc/lab/scenamatica/context/ContextManagerImpl.java | 3 ++- .../net/kunmc/lab/scenamatica/scenario/ScenarioEngineImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ScenamaticaContextEngine/src/main/java/net/kunmc/lab/scenamatica/context/ContextManagerImpl.java b/ScenamaticaContextEngine/src/main/java/net/kunmc/lab/scenamatica/context/ContextManagerImpl.java index 47aa253b4..2411ee6d2 100644 --- a/ScenamaticaContextEngine/src/main/java/net/kunmc/lab/scenamatica/context/ContextManagerImpl.java +++ b/ScenamaticaContextEngine/src/main/java/net/kunmc/lab/scenamatica/context/ContextManagerImpl.java @@ -112,11 +112,12 @@ public Context prepareContext(@NotNull ScenarioFileBean scenario, @NotNull UUID this.isActorPrepared = ThreadingUtil.waitFor(this.registry.getPlugin(), () -> { try { + Thread.sleep(300); // アクションとの排他制御のためにちょっと待つ。 for (PlayerBean actor : context.getActors()) actors.add(this.actorManager.createActor(actor)); return true; } - catch (ContextPreparationException e) + catch (ContextPreparationException | InterruptedException e) { throw new IllegalStateException(e); } diff --git a/ScenamaticaScenarioEngine/src/main/java/net/kunmc/lab/scenamatica/scenario/ScenarioEngineImpl.java b/ScenamaticaScenarioEngine/src/main/java/net/kunmc/lab/scenamatica/scenario/ScenarioEngineImpl.java index 614883b40..c8a3f9d27 100644 --- a/ScenamaticaScenarioEngine/src/main/java/net/kunmc/lab/scenamatica/scenario/ScenarioEngineImpl.java +++ b/ScenamaticaScenarioEngine/src/main/java/net/kunmc/lab/scenamatica/scenario/ScenarioEngineImpl.java @@ -129,7 +129,7 @@ public TestResult start(@NotNull TriggerBean trigger) throws TriggerNotFoundExce MsgArgs.of("scenarioName", this.scenario.getName()) )); this.state = TestState.STARTING; - Thread.sleep(300); // アクションとの排他制御のためにちょっと待つ。ロードしてる風でごめんね >< + Thread.sleep(150); // アクションとの排他制御のためにちょっと待つ。ロードしてる風でごめんね >< TestResult result = this.startScenarioRun(compiledTrigger); this.state = TestState.FINISHED;