diff --git a/buildSrc/src/main/groovy/steamwar.devserver.gradle b/buildSrc/src/main/groovy/steamwar.devserver.gradle
index ce3b8765..71b0027d 100644
--- a/buildSrc/src/main/groovy/steamwar.devserver.gradle
+++ b/buildSrc/src/main/groovy/steamwar.devserver.gradle
@@ -64,6 +64,10 @@ class DevServer extends DefaultTask {
     @Optional
     Boolean forceUpgrade = null
 
+    @Input
+    @Optional
+    String worldName = null
+
     DevServer() {
         super()
         doFirst {
@@ -83,13 +87,16 @@ class DevServer extends DefaultTask {
                 }
             }
 
-            worldName = properties.get("worldName")
+            if (template.startsWith("Bau")) {
+                if (properties.containsKey("worldName")) {
+                    worldName = properties.get("worldName")
+                } else {
+                    throw new GradleException("Please supply the 'worldName' in a 'steamwar.properties' files either in this project dir or any parent project!")
+                }
+            }
             host = properties.get("host")
             debugPort = new Random().nextInt(5001, 10000)
 
-            if (worldName == null) {
-                throw new GradleException("Please supply the 'worldName' in a 'steamwar.properties' files either in this project dir or any parent project!")
-            }
             if (host == null) {
                 throw new GradleException("Please supply the 'host' in a 'steamwar.properties' files either in this project dir or any parent project!")
             }
@@ -115,9 +122,6 @@ class DevServer extends DefaultTask {
     @Internal
     Boolean running = true
 
-    @Internal
-    String worldName = null
-
     class Finalizer extends DefaultTask {
 
         Finalizer() {