Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-09 01:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: try to fix navmesh load

Browse Source
This commit is contained in:
Nils Bergmann 2021-12-08 00:40:15 +01:00
parent 4a3d341c9a
commit cf6f69ba93
No known key found for this signature in database
GPG Key ID: 5FAEC08EE1DC2DF9
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -6,3 +6,5 @@ BUILD_THREADS=1
BUILD_VERSION=171022 BUILD_VERSION=171022
# make sure this is a long random string # make sure this is a long random string
ACCOUNT_MANAGER_SECRET= ACCOUNT_MANAGER_SECRET=
# Needs to be set to the actual public ip. See https://github.com/DarkflameUniverse/DarkflameServer/issues/45
EXTERNAL_IP=0.0.0.0

1
docker-compose.yml
View File

@ -30,6 +30,7 @@ services:
- DATABASE_HOST=database - DATABASE_HOST=database
- DATABASE_USER=${MARIADB_USER:-darkflame} - DATABASE_USER=${MARIADB_USER:-darkflame}
- DATABASE_PASSWORD=${MARIADB_PASSWORD:-darkflame} - DATABASE_PASSWORD=${MARIADB_PASSWORD:-darkflame}
- EXTERNAL_IP=${EXTERNAL_IP:-localhost}
volumes: volumes:
- ${CLIENT_PATH:?err}:/client - ${CLIENT_PATH:?err}:/client
depends_on: depends_on:

3
docker/Dockerfile
View File

@ -37,8 +37,7 @@ RUN echo "Build server" && \
cmake .. && \ cmake .. && \
make -j $BUILD_THREADS make -j $BUILD_THREADS
RUN mkdir -p /build/build/res/maps/navmeshes/ && \ RUN unzip /build/resources/navmeshes.zip -d /build/build/res/maps
unzip /build/resources/navmeshes.zip -d /build/build/res/maps
FROM gcc:11 as runtime FROM gcc:11 as runtime

4
docker/pkextractor.py
View File

@ -113,9 +113,9 @@ class PKExtractor:
original_md5 = self.records[path][4] original_md5 = self.records[path][4]
dir, filename = os.path.split(path) dir, filename = os.path.split(path)
out = os.path.join(outdir, dir) out = os.path.join(outdir, dir.lower())
os.makedirs(out, exist_ok=True) os.makedirs(out, exist_ok=True)
out_file_path = os.path.join(out, filename) out_file_path = os.path.join(out, filename.lower())
if os.path.isfile(out_file_path): if os.path.isfile(out_file_path):
with open(out_file_path, "rb") as f: with open(out_file_path, "rb") as f:

11
docker/start_server.sh
View File

@ -45,6 +45,9 @@ function update_database_ini_values_for() {
update_ini $INI_FILE mysql_database $DATABASE update_ini $INI_FILE mysql_database $DATABASE
update_ini $INI_FILE mysql_username $DATABASE_USER update_ini $INI_FILE mysql_username $DATABASE_USER
update_ini $INI_FILE mysql_password $DATABASE_PASSWORD update_ini $INI_FILE mysql_password $DATABASE_PASSWORD
if [[ "$INI_FILE" != "worldconfig.ini" ]]; then
update_ini $INI_FILE external_ip $EXTERNAL_IP
fi
} }
function update_ini_values() { function update_ini_values() {
@ -62,8 +65,14 @@ function symlink_client_files() {
ln -s /client/client/res/BrickModels/ /app/res/BrickModels ln -s /client/client/res/BrickModels/ /app/res/BrickModels
ln -s /client/client/res/chatplus_en_us.txt /app/res/chatplus_en_us.txt ln -s /client/client/res/chatplus_en_us.txt /app/res/chatplus_en_us.txt
ln -s /client/client/res/names/ /app/res/names ln -s /client/client/res/names/ /app/res/names
ln -s /client/client/res/maps/ /app/res/maps
ln -s /client/client/locale/locale.xml /app/locale/locale.xml ln -s /client/client/locale/locale.xml /app/locale/locale.xml
(
cd /client/client/res/maps
readarray -d '' entries < <(printf '%s\0' * | sort -zV)
for entry in "${entries[@]}"; do
ln -s /client/client/res/maps/$entry /app/res/maps/
done
)
} }
function fdb_to_sqlite() { function fdb_to_sqlite() {