From 3044fb297856ad9451d7ae6e9504adf9a0de35c0 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 28 Jan 2019 20:45:28 +0200 Subject: [PATCH] Fixed crashing bug caused by using GameBasics.Technologies.keys directly, and editing it --- android/assets/jsons/Techs.json | 4 ++-- core/src/com/unciv/logic/GameInfo.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json index 5ff3e679d9..290299ddd5 100644 --- a/android/assets/jsons/Techs.json +++ b/android/assets/jsons/Techs.json @@ -482,12 +482,12 @@ name:"Nanotechnology", row:3, prerequisites:["Robotics","Ecology"] - } + }, { name:"Particle Physics", row:4, prerequisites:["Nuclear Fission"] - } + }, { name:"Satellites", row:5, diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 1cb346c635..7c96abe348 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -91,7 +91,7 @@ class GameInfo { tile = viableTiles.getRandom() } - var allResearchedTechs = GameBasics.Technologies.keys + val allResearchedTechs = GameBasics.Technologies.keys.toMutableList() for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) { allResearchedTechs.retainAll(civ.tech.techsResearched) }