cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

More work on the mapmerge tool.

Browse Source
This commit is contained in:
cib
2012-11-11 01:57:49 +01:00
parent 79e4bfec2c
commit 34d4e3104b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MapPatcher.jar
Executable → Regular
BIN
View File
Binary file not shown.
mapmerge.sh
+7 -6
View File
@@ -1,8 +1,9 @@
java -jar MapPatcher.jar -unpack $1 $1 > /dev/null
java -jar MapPatcher.jar -unpack $2 $2 > /dev/null
java -jar MapPatcher.jar -unpack $3 $3 > /dev/null
java -jar MapPatcher.jar -merge $1 $2 $3 $2
if [ "$?" -gt 0 ]
then
echo "Unable to automatically resolve map conflicts, please merge manually."
exit 1
fi
java -jar MapPatcher.jar -clean $1 $2 $2
cp $2 original.dmm
echo "Map merge conflict, make sure to repack the map with MapPatcher -pack and clean it with MapPatcher -clean original.dmm"
exit 0