From 78735bcfad10e632e1725330febc9a3043d4ffdc Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 6 Jan 2021 22:41:00 +0200
Subject: [PATCH] Better 'conflicting tech' check for mods

---
 core/src/com/unciv/models/ruleset/Ruleset.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt
index 3cc849e0d2..19c049999a 100644
--- a/core/src/com/unciv/models/ruleset/Ruleset.kt
+++ b/core/src/com/unciv/models/ruleset/Ruleset.kt
@@ -228,8 +228,8 @@ class Ruleset {
         }
 
         for (tech in technologies.values) {
-            for (otherTech in tech.column!!.techs) {
-                if (tech != otherTech && otherTech.row == tech.row)
+            for (otherTech in technologies.values) {
+                if (tech != otherTech && otherTech.column == tech.column && otherTech.row == tech.row)
                     lines += "${tech.name} is in the same row as ${otherTech.name}!"
             }
         }