From f7db2ab377927a79d59dab6e03ecceb0e828d437 Mon Sep 17 00:00:00 2001 From: jojo Date: Sat, 19 Dec 2020 12:29:45 +0100 Subject: [PATCH] Improve Code Complexity --- src/de/steamwar/misslewars/scripts/Script.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/de/steamwar/misslewars/scripts/Script.java b/src/de/steamwar/misslewars/scripts/Script.java index 9a3c23e..73e4b67 100644 --- a/src/de/steamwar/misslewars/scripts/Script.java +++ b/src/de/steamwar/misslewars/scripts/Script.java @@ -35,41 +35,31 @@ public class Script { private class ScriptExecutor { private int index = 0; - private final RunnableScriptEvent runnableScriptEvent; public ScriptExecutor(RunnableScriptEvent runnableScriptEvent) { this.runnableScriptEvent = runnableScriptEvent; - } - - public void start() { resume(); } private void resume() { while (index < runnableScriptList.size()) { - RunnableScript runnableScript = runnableScriptList.get(index); + RunnableScript runnableScript = runnableScriptList.get(index++); if (runnableScript instanceof DelayScript) { - index++; - resumeLater(((DelayScript) runnableScript).getDelayTime()); - break; + Bukkit.getScheduler().runTaskLater(MissileWars.getPlugin(), this::resume, ((DelayScript) runnableScript).getDelayTime()); + return; } if (!runnableScript.execute(runnableScriptEvent)) { index = runnableScriptList.size(); return; } - index++; } } - private void resumeLater(int delayTime) { - Bukkit.getScheduler().runTaskLater(MissileWars.getPlugin(), this::resume, delayTime); - } - } public void execute(RunnableScriptEvent runnableScriptEvent) { - new ScriptExecutor(runnableScriptEvent).start(); + new ScriptExecutor(runnableScriptEvent); } private void add(RunnableScript runnableScript) {