Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix potential dungeon game rule NPE

Browse Source
This commit is contained in:
Daniel Saukel 2020-03-18 19:33:06 +01:00
parent 5fb6aba071
commit 929a87ac68
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/de/erethon/dungeonsxl/dungeon/DDungeon.java
View File

@ -187,6 +187,8 @@ public class DDungeon implements Dungeon {
rules.merge(getDefaultValues()); rules.merge(getDefaultValues());
} else if (map.getRules() != null) { } else if (map.getRules() != null) {
rules = new GameRuleContainer(map.getRules()); rules = new GameRuleContainer(map.getRules());
} else {
rules = new GameRuleContainer();
} }
rules.merge(plugin.getMainConfig().getDefaultWorldConfig()); rules.merge(plugin.getMainConfig().getDefaultWorldConfig());
rules.merge(GameRuleContainer.DEFAULT_VALUES); rules.merge(GameRuleContainer.DEFAULT_VALUES);