diff --git a/.gitignore b/.gitignore index 1050628..9fe89b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .classpath .project rscd.jar +moparclassic.jar ls.jar *.ipr *.iws diff --git a/GameServer/build.xml b/GameServer/build.xml index 64842d6..61d2977 100644 --- a/GameServer/build.xml +++ b/GameServer/build.xml @@ -30,16 +30,6 @@ - - - - - - - - - - @@ -50,10 +40,6 @@ - - - - @@ -63,6 +49,20 @@ + + + + + + + + + + + + + + @@ -87,7 +87,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/GameServer/moparclassic.jar b/GameServer/moparclassic.jar deleted file mode 100644 index 6b651aa..0000000 Binary files a/GameServer/moparclassic.jar and /dev/null differ diff --git a/GameServer/run_server.sh b/GameServer/run_server.sh index 8dc7e46..8382939 100755 --- a/GameServer/run_server.sh +++ b/GameServer/run_server.sh @@ -1 +1,2 @@ -ant run +#!/bin/sh +java -jar moparclassic.jar \ No newline at end of file diff --git a/LoginServer/build.xml b/LoginServer/build.xml index 5870828..a881fdb 100644 --- a/LoginServer/build.xml +++ b/LoginServer/build.xml @@ -8,10 +8,10 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/LoginServer/runls.sh b/LoginServer/runls.sh index 8dc7e46..64c2812 100755 --- a/LoginServer/runls.sh +++ b/LoginServer/runls.sh @@ -1 +1,4 @@ -ant run +#!/bin/bash +libs=$(find lib/ -type f -print0 | sed "s/\x0/:/g") +#libs="lib/slf4j.jar:lib/hex-string.jar:lib/mysql-connector.jar:lib/xstream.jar:lib/xpp3.jar:lib/mina.jar:" +java -cp "$libs./ls.jar" org.moparscape.msc.ls.Server