From 34d4e3104b5daff86264afdfb517f84802c741a7 Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 01:41:04 +0100 Subject: [PATCH] More work on the mapmerge tool. --- MapPatcher.jar | Bin 9589 -> 10136 bytes mapmerge.sh | 13 +++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) mode change 100755 => 100644 MapPatcher.jar diff --git a/MapPatcher.jar b/MapPatcher.jar old mode 100755 new mode 100644 index 18d5b8f37505ea29884fc5dcb25d77d2752e84b0..5cbaad488c146d8a7453f114260dbccfe61e7861 GIT binary patch delta 3753 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 TB^(0VB9lucBnA{F00000NJuF@ delta 3202 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 diff --git a/mapmerge.sh b/mapmerge.sh index e5bc0710b25..f457e02ab74 100755 --- a/mapmerge.sh +++ b/mapmerge.sh @@ -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