Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-25 18:47:50 +01:00
Code Issues Projects Releases Wiki Activity

Fix empty config values from old config

Browse Source
This commit is contained in:
Rsl1122 2019-01-17 11:22:51 +02:00
parent 1273f26a64
commit c011bb6be0
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/system/settings/config/ConfigNode.java
View File

@ -23,6 +23,8 @@
*/ */
package com.djrapitops.plan.system.settings.config; package com.djrapitops.plan.system.settings.config;
import com.djrapitops.plugin.utilities.Verify;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -294,7 +296,7 @@ public class ConfigNode {
} }
// Override value conditionally // Override value conditionally
if (value == null && from.value != null) { if (Verify.isEmpty(value) && from.value != null) {
value = from.value; value = from.value;
} }

3
Plan/common/src/test/resources/config/4.5.2-config.yml
View File

@ -76,7 +76,8 @@ Analysis:
DestinationFolder: 'Analysis Results' DestinationFolder: 'Analysis Results'
Data: Data:
# How many minutes player has to stay still to be considered AFK # How many minutes player has to stay still to be considered AFK
AFKThresholdMinutes: 3 # TEST: THIS NODE HAS BEEN INTENTIONALLY LEFT EMPTY TO TEST DEFAULT COPYING
AFKThresholdMinutes:
Commands: Commands:
LogUnknownCommands: false LogUnknownCommands: false
CombineCommandAliases: true CombineCommandAliases: true