Skip to content

Commit a76eab1

Browse files
committed
Yet another fix for server.sh
1 parent 970ebf8 commit a76eab1

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

server.sh

+12-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fi
6767
echo "#!/bin/bash" >launchmc
6868
echo "export LD_PRELOAD=\"${PWD}/halfshell\" && java -Xms${mem_starting} -Xmx${mem_total} -jar minecraft_server.${mcver}.jar nogui" >>launchmc
6969
if $autorestart; then
70-
echo "./server.sh $origswitch --restart" >>launchmc
70+
echo "export LD_PRELOAD=\"\" && ./server.sh $origswitch --restart" >>launchmc
7171
fi
7272

7373
if ! $restart; then
@@ -93,11 +93,15 @@ fi
9393
if screen -ls | grep "${hmScreen}">/dev/null; then
9494
echo "halfMod already running . . ."
9595
echo "Launching halfShell + Minecraft $mcver . . ."
96-
screen -A -m -d -S ${hsScreen} /bin/bash launchmc
96+
if $restart; then
97+
/bin/bash launchmc
98+
else
99+
screen -A -m -d -S ${hsScreen} /bin/bash launchmc
100+
fi
97101
else
98102
echo "Launching halfMod . . ."
99103
if $autorestart; then
100-
screen -A -m -d -S ${hmScreen} /bin/bash halfHold.sh "${hsswitch[@]}" --debug --mc-version=${mcver} localhost 9422
104+
screen -A -m -d -S ${hmScreen} /bin/bash halfHold.sh $hmDebug $hmQuiet $hmVerbose --mc-version=${mcver} "${hsswitch[@]}" localhost 9422
101105
else
102106
screen -A -m -d -S ${hmScreen} ./halfmod_engine $hmDebug $hmQuiet $hmVerbose --mc-version=${mcver} "${hsswitch[@]}" localhost 9422
103107
fi
@@ -107,7 +111,11 @@ else
107111
done
108112
rm "listo.nada"
109113
echo "Launching halfShell + Minecraft $mcver . . ."
110-
screen -A -m -d -S ${hsScreen} /bin/bash launchmc
114+
if $restart; then
115+
/bin/bash launchmc
116+
else
117+
screen -A -m -d -S ${hsScreen} /bin/bash launchmc
118+
fi
111119
# 1.12.2 ${hsScreen}
112120
# screen -A -m -d -S ${hsScreen} ./launchhs.sh
113121
fi

0 commit comments

Comments
 (0)