src/de/steamwar/misslewars/scripts/RunnableScript.java

@@ -19,10 +19,17 @@
 
 package de.steamwar.misslewars.scripts;
 
+import java.util.function.UnaryOperator;
+
 public interface RunnableScript {
     boolean execute(RunnableScriptEvent runnableScriptEvent);
 
     interface ScriptFunction {
         boolean execute(RunnableScriptEvent runnableScriptEvent, double... doubles);
     }
+
+    default boolean defaultExecution(ScriptFunction scriptFunction, boolean nullReturn, UnaryOperator<Boolean> returnValue, RunnableScriptEvent runnableScriptEvent, double... doubles) {
+        if (scriptFunction == null) return nullReturn;
+        return returnValue.apply(scriptFunction.execute(runnableScriptEvent, doubles));
+    }
 }

src/de/steamwar/misslewars/scripts/Script.java

@@ -64,8 +64,7 @@ public class Script {
     }
 
     private static RunnableScript parseScriptSnippet(JsonObject jsonObject) {
-        if (!jsonObject.has("type"))
+        if (!jsonObject.has("type")) return null;
-            return null;
         switch (jsonObject.getAsJsonPrimitive("type").getAsString().toLowerCase()) {
             case "delay":
                 return new DelayScript(jsonObject);

src/de/steamwar/misslewars/scripts/implemented/FilterScript.java

@@ -62,8 +62,7 @@ public class FilterScript implements RunnableScript {
 
     @Override
     public boolean execute(RunnableScriptEvent runnableScriptEvent) {
-        if (filter == null) return true;
+        return defaultExecution(filter, true, b -> b ^ inverted, runnableScriptEvent);
-        return filter.execute(runnableScriptEvent) ^ inverted;
     }
 
 }

src/de/steamwar/misslewars/scripts/implemented/LaunchScript.java

@@ -44,10 +44,8 @@ public class LaunchScript implements RunnableScript {
 
     @Override
     public boolean execute(RunnableScriptEvent runnableScriptEvent) {
-        if (launch == null) return false;
         if (runnableScriptEvent.eventType != ScriptedItem.EventType.onClick) return true;
-        launch.execute(runnableScriptEvent);
+        return defaultExecution(launch, false, b -> true, runnableScriptEvent);
-        return true;
     }
 
 }

src/de/steamwar/misslewars/scripts/implemented/LocationScript.java

@@ -83,8 +83,7 @@ public class LocationScript implements RunnableScript {
     @Override
     public boolean execute(RunnableScriptEvent runnableScriptEvent) {
         runnableScriptEvent.setLocationType(locationType);
-        if (locationExecutor != null) locationExecutor.execute(runnableScriptEvent, x, y, z);
+        return defaultExecution(locationExecutor, true, b -> true, runnableScriptEvent, x, y, z);
-        return true;
     }
 
 }

src/de/steamwar/misslewars/scripts/implemented/SoundScript.java

@@ -23,9 +23,10 @@ import com.google.gson.JsonObject;
 import de.steamwar.misslewars.scripts.RunnableScript;
 import de.steamwar.misslewars.scripts.RunnableScriptEvent;
 import de.steamwar.misslewars.scripts.ScriptedItem;
-import de.steamwar.misslewars.scripts.utils.JsonUtils;
 import org.bukkit.Sound;
-import org.bukkit.entity.Player;
+
+import static de.steamwar.misslewars.scripts.utils.JsonUtils.getFloat;
+import static de.steamwar.misslewars.scripts.utils.JsonUtils.getString;
 
 public class SoundScript implements RunnableScript {
 
@@ -34,17 +35,16 @@ public class SoundScript implements RunnableScript {
     private float pitch;
 
     public SoundScript(JsonObject sound) {
-        JsonUtils.getString(sound, "sound", value -> this.sound = Sound.valueOf(value));
+        getString(sound, "sound", value -> this.sound = Sound.valueOf(value));
-        volume = JsonUtils.getFloat(sound, "volume", 100);
+        volume = getFloat(sound, "volume", 100);
-        pitch = JsonUtils.getFloat(sound, "pitch", 1);
+        pitch = getFloat(sound, "pitch", 1);
     }
 
     @Override
     public boolean execute(RunnableScriptEvent runnableScriptEvent) {
         if (sound == null) return false;
         if (runnableScriptEvent.eventType != ScriptedItem.EventType.onClick) return true;
-        Player player = runnableScriptEvent.getPlayer();
+        runnableScriptEvent.getPlayer().playSound(runnableScriptEvent.getPlayer().getLocation(), sound, volume, pitch);
-        player.playSound(player.getLocation(), sound, volume, pitch);
         return true;
     }
 

src/de/steamwar/misslewars/scripts/implemented/SummonScript.java

@@ -43,9 +43,7 @@ public class SummonScript implements RunnableScript {
 
     @Override
     public boolean execute(RunnableScriptEvent runnableScriptEvent) {
-        if (summon == null) return false;
+        return defaultExecution(summon, false, b -> true, runnableScriptEvent);
-        summon.execute(runnableScriptEvent);
-        return true;
     }
 
 }