diff --git a/Client/.gitignore b/Client/.gitignore index 17a06722d..7098faf62 100644 --- a/Client/.gitignore +++ b/Client/.gitignore @@ -14,5 +14,4 @@ data/cache/ *.iml *.eml *.userlibraries -*.class data/players/** diff --git a/CompiledServer/production/09Scape/.gitignore b/CompiledServer/production/09Scape/.gitignore index cfc59933f..7098faf62 100644 --- a/CompiledServer/production/09Scape/.gitignore +++ b/CompiledServer/production/09Scape/.gitignore @@ -10,6 +10,7 @@ data/profile/** .class** /bin/ /out/ +data/cache/ *.iml *.eml *.userlibraries diff --git a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs index a698e5967..7297e84ef 100644 --- a/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs +++ b/CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate diff --git a/CompiledServer/production/09Scape/runServer.sh b/CompiledServer/production/09Scape/runServer.sh index 0fbd1a99e..9b5ea2789 100755 --- a/CompiledServer/production/09Scape/runServer.sh +++ b/CompiledServer/production/09Scape/runServer.sh @@ -1,3 +1,5 @@ rm -rf org cp -r ../CompiledServer/production/09Scape/org . +rm -rf plugin/ +cp -r ../CompiledServer/production/09Scape/org/crandor/plugin . java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server diff --git a/Management-Server/.gitignore b/Management-Server/.gitignore index 85b4f9e6f..4047fba69 100644 --- a/Management-Server/.gitignore +++ b/Management-Server/.gitignore @@ -14,6 +14,5 @@ data/cache/ *.iml *.eml *.userlibraries -*.class data/players/** org/ diff --git a/Server/.gitignore b/Server/.gitignore index cfc59933f..031002751 100644 --- a/Server/.gitignore +++ b/Server/.gitignore @@ -7,7 +7,6 @@ data/profile/** .DS_Store** .project** .classpath** -.class** /bin/ /out/ *.iml diff --git a/Server/runServer.sh b/Server/runServer.sh index 0fbd1a99e..19796f0e4 100755 --- a/Server/runServer.sh +++ b/Server/runServer.sh @@ -1,3 +1,5 @@ rm -rf org cp -r ../CompiledServer/production/09Scape/org . +rm -rf plugin/ +cp -r ../CompiledServer/production/09Scape/plugin/ . java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server