From b6b32199f224bb577704785beefd9afb2564c4f4 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 28 Oct 2019 13:51:54 +0300
Subject: [PATCH 1/2] v 1.21.01

---
 modules/river-generator.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/river-generator.js b/modules/river-generator.js
index cd8f09f4..8a471c1c 100644
--- a/modules/river-generator.js
+++ b/modules/river-generator.js
@@ -285,10 +285,11 @@
   }
 
   const getBasin = function(r, p, e) {
-    while (p) {
+    while (p && r !== p) {
       const parent = pack.rivers.find(r => r.i === p);
-      if (parent) r = parent.i;
-      p = parent ? parent.parent : 0;
+      if (!parent) return r;
+      r = parent.i;
+      p = parent.parent;
       if (r === e) return r;
     }
     return r;
@@ -296,4 +297,4 @@
 
   return {generate, resolveDepressions, addMeandring, getPath, specify, getName, getBasin, remove};
 
-})));
\ No newline at end of file
+})));

From f4fa36a1ca2a3a0cad9cc9be52e842e6781ab4e1 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Mon, 28 Oct 2019 13:52:13 +0300
Subject: [PATCH 2/2] v 1.21.02

---
 modules/save-and-load.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/save-and-load.js b/modules/save-and-load.js
index 2fb726ed..a5fdcc28 100644
--- a/modules/save-and-load.js
+++ b/modules/save-and-load.js
@@ -670,7 +670,7 @@ function parseLoadedData(data) {
       pack.burgs = JSON.parse(data[15]);
       pack.religions = data[29] ? JSON.parse(data[29]) : [{i: 0, name: "No religion"}];
       pack.provinces = data[30] ? JSON.parse(data[30]) : [0];
-      pack.rivers = data[32] ? JSON.stringify(data[32]) : [];
+      pack.rivers = data[32] ? JSON.parse(data[32]) : [];
 
       const cells = pack.cells;
       cells.biome = Uint8Array.from(data[16].split(","));