From eb6215e0184561eebc6849b5e518294280e4ecaf Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 22 May 2015 11:46:27 +0200
Subject: [PATCH] https://github.com/eressea/server/issues/203 terrain_t check
 was exactly wrong, causing log spam. remove obsolete line from E4 config.

---
 conf/e4/config.xml | 1 -
 src/jsreport.c     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/conf/e4/config.xml b/conf/e4/config.xml
index adf355157..641bfb25b 100644
--- a/conf/e4/config.xml
+++ b/conf/e4/config.xml
@@ -58,7 +58,6 @@
     <order name="tax" disable="yes"/>
     <order name="entertain" disable="yes"/>
     <order name="sell" disable="yes"/>
-    <order name="origin" disable="no"/>
 
     <skill name="armorer" enable="true"/>
     <skill name="bow" enable="true"/>
diff --git a/src/jsreport.c b/src/jsreport.c
index 2ea46b678..e9fb5ee3f 100644
--- a/src/jsreport.c
+++ b/src/jsreport.c
@@ -58,7 +58,7 @@ static int report_json(const char *filename, report_context * ctx, const char *c
                             sr = find_seen(ctx->seen, r);
                             if (sr) {
                                 terrain_t ter = oldterrain(r->terrain);
-                                if (ter != NOTERRAIN) {
+                                if (ter == NOTERRAIN) {
                                     log_warning("report_json: %s has no terrain id\n", r->terrain->_name);
                                 }
                                 data = 1 + (int)ter;