From df3ce116a72eb5e847248532cd11a34be4f95486 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 27 Dec 2014 23:50:34 +0100 Subject: [PATCH 1/2] limit eternath gates to 1-person units, avoid crash --- scripts/eressea/eternath.lua | 1 + src/build.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/eressea/eternath.lua b/scripts/eressea/eternath.lua index 1a93ad352..afdebb40e 100644 --- a/scripts/eressea/eternath.lua +++ b/scripts/eressea/eternath.lua @@ -22,6 +22,7 @@ end local eternath = {} function eternath.update() + local size = 1 if b1 and b2 then local units1 = gates.units(b1, size) local units2 = gates.units(b2, size) diff --git a/src/build.h b/src/build.h index 78d54c0d4..1b880e8d1 100644 --- a/src/build.h +++ b/src/build.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 3 #define VERSION_MINOR 3 -#define VERSION_BUILD 693 +#define VERSION_BUILD 694 From 50aa3cc444b343efbf2741c9b26fa47376f3b6d5 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 28 Dec 2014 17:27:49 +0100 Subject: [PATCH 2/2] backup with orders after the turn is done --- process/cron/run-eressea | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/process/cron/run-eressea b/process/cron/run-eressea index 5cda0d008..f31150c1a 100755 --- a/process/cron/run-eressea +++ b/process/cron/run-eressea @@ -26,15 +26,17 @@ if [ ! -s $ERESSEA/game-$GAME/orders.$TURN ]; then echo "server did not create orders for turn $TURN in game $GAME" exit 2 fi +if [ ! -s $REPORTS/reports.txt ]; then + echo "server did not create reports.txt in game $GAME" + exit 4 +fi +$BIN/backup-eressea $GAME $TURN let TURN=$TURN+1 if [ ! -s $ERESSEA/game-$GAME/data/$TURN.dat ]; then echo "server did not create data for turn $TURN in game $GAME" exit 3 fi -if [ ! -s $REPORTS/reports.txt ]; then - echo "server did not create reports.txt for turn $TURN in game $GAME" - exit 4 -fi +echo "sending reports for game $GAME, turn $TURN" $BIN/compress.sh $GAME $TURN $BIN/sendreports.sh $GAME $BIN/backup-eressea $GAME $TURN