Skip to content

Commit

Permalink
Added Java path for client-bundled server
Browse files Browse the repository at this point in the history
  • Loading branch information
ago1024 committed Jan 24, 2016
1 parent e983167 commit af81c7b
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
6 changes: 5 additions & 1 deletion modlauncher.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

if exist logging.properties set LOGGING=-Djava.util.logging.config.file=logging.properties

runtime\bin\java "-Dworkdir=%CD%" "-Djava.library.path=%CD%\nativelibs" %LOGGING% -Xmn256M -Xms512m -Xmx2048m -XX:+OptimizeStringConcat -XX:+AggressiveOpts -jar modlauncher.jar %*
set JAVA=java
if exist runtime\bin\java.exe set JAVA=runtime\bin\java.exe
if exist ..\runtime\bin\java.exe set JAVA=..\runtime\bin\java.exe

%JAVA% "-Dworkdir=%CD%" "-Djava.library.path=%CD%\nativelibs" %LOGGING% -Xmn256M -Xms512m -Xmx2048m -XX:+OptimizeStringConcat -XX:+AggressiveOpts -jar modlauncher.jar %*
6 changes: 5 additions & 1 deletion patcher.bat
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
runtime\bin\java -classpath patcher.jar;javassist.jar org.gotti.wurmunlimited.patcher.PatchServerJar
set JAVA=java
if exist runtime\bin\java.exe set JAVA=runtime\bin\java.exe
if exist ..\runtime\bin\java.exe set JAVA=..\runtime\bin\java.exe

%JAVA% -classpath patcher.jar;javassist.jar org.gotti.wurmunlimited.patcher.PatchServerJar
13 changes: 9 additions & 4 deletions patcher.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
#!/bin/sh

java() {
runtime/jre1.8.0_60/bin/java $*
}
java -classpath patcher.jar:javassist.jar org.gotti.wurmunlimited.patcher.PatchServerJar
if test -x "runtime/jre1.8.0_60/bin/java"; then
JAVA="runtime/jre1.8.0_60/bin/java"
elif test -x "../runtime/jre1.8.0_60/bin/java"; then
JAVA="../runtime/jre1.8.0_60/bin/java"
else
JAVA="java"
fi

"$JAVA" -classpath patcher.jar:javassist.jar org.gotti.wurmunlimited.patcher.PatchServerJar
chmod a+x WurmServerLauncher-patched

0 comments on commit af81c7b

Please sign in to comment.