Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bundle updates as part of commit

Browse Source
This commit is contained in:
Anuken
2021-11-22 11:52:08 -05:00
parent 521b0e1ec4
commit e0b14db778
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/src/mindustry/tools/BundleLauncher.java
View File

@@ -56,7 +56,7 @@ public class BundleLauncher{
int added = 0;
for(String key : base.orderedKeys()){
if(!other.containsKey(key) || other.get(key).trim().isEmpty()){
if(other.get(key) == null || other.get(key).trim().isEmpty()){
other.put(key, base.get(key));
added++;
Log.info("&lc- Adding missing key '@'...", key);
@@ -73,7 +73,9 @@ public class BundleLauncher{
StringBuilder result = new StringBuilder();
//add everything ordered
for(String key : base.orderedKeys().and(extras.keys().toSeq())){
for(String key : base.orderedKeys().copy().and(extras.keys().toSeq())){
if(other.get(key) == null) continue;
result.append(processor.get(key, other.get(key)));
other.remove(key);
}