From fde47976a1531a14706d8b8c38ce87b0ab5aa93f Mon Sep 17 00:00:00 2001
From: Marcel Hanraets <marcel@hanraets.eu>
Date: Fri, 11 Jul 2014 10:53:13 +0200
Subject: [PATCH] Fixed startup checking

---
 craftbukkit | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/craftbukkit b/craftbukkit
index 8ed8d9f..bd9ccba 100644
--- a/craftbukkit
+++ b/craftbukkit
@@ -31,11 +31,15 @@ case "$1" in
     if [ -z "$(pgrep -f -n $JARNAME)" ]; then
       log_daemon_msg "Starting Minecraft Server" "Craftbukkit"
       sudo -u ${USER} tmux new-session -d -s craftbukkit-console "cd ${SRVPATH}; java ${JAVAOPTS} -jar ${JARNAME}" >/dev/null 2>&1
-      if [ $? -gt 0 ]; then
+      sleep 1
+      if [ $? -gt 0 ]; then  # Tmux did not start
+        log_failure_msg
+        exit 1
+      elif [ -z "$(pgrep -f -n $JARNAME)" ]; then  # Tmux stared, but Java did not
         log_failure_msg
         exit 1
       else
-        log_success_msg # @FIXME Success is returned when the java command fails
+        log_success_msg
       fi
     else
       log_warning_msg "Craftbukkit is already running!"