From c50b774c1986bce3c5ac041a27e503aa148bab7a Mon Sep 17 00:00:00 2001 From: "Jason M. Wood" Date: Sun, 3 Nov 2013 11:41:14 -0700 Subject: [PATCH] Move the default world, port, and IP variables to join the rest of the default world variables --- minecraft_server | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/minecraft_server b/minecraft_server index c3e9829..bf6bef7 100755 --- a/minecraft_server +++ b/minecraft_server @@ -163,6 +163,9 @@ CURRENT_VERSION=$( # --------------------------------------------------------------------------- # Default settings if not provided in the world's server.properties file. +DEFAULT_WORLD="world" +DEFAULT_PORT="25565" +DEFAULT_IP="" DEFAULT_SERVER_VERSION=$CURRENT_VERSION DEFAULT_SERVER_JAR='minecraft_server.$SERVER_VERSION.jar' DEFAULT_SERVER_URL='https://s3.amazonaws.com/Minecraft.Download/versions/$SERVER_VERSION/minecraft_server.$SERVER_VERSION.jar' @@ -224,12 +227,6 @@ WORLDS_LOCATION="$LOCATION/worlds" # The location to store disabled world server files. DISABLED_WORLDS_LOCATION="$LOCATION/worlds-disabled" -# Default world name, port, and IP address if the worlds.conf file is -# missing. -DEFAULT_WORLD="world" -DEFAULT_PORT="25565" -DEFAULT_IP="" - # Global Message Of The Day file (MOTD) # ---------------------------------------------------------------------------