From 03cf9a668b5ccd3d0b514daf47b36290a3e70c15 Mon Sep 17 00:00:00 2001 From: wizjany Date: Wed, 15 Jun 2016 23:16:08 -0400 Subject: [PATCH] Actually fix unmarshalling of region group flags. --- .../protection/flags/registry/SimpleFlagRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java index 4b0800d5..015ba2e9 100644 --- a/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/registry/SimpleFlagRegistry.java @@ -142,9 +142,9 @@ public Map, Object> unmarshal(Map rawValues, boolean cre String parentName = entry.getKey().replaceAll("-group", ""); Flag parent = get(parentName); if (parent == null || parent instanceof UnknownFlag) { - forceRegister(new UnknownFlag(entry.getKey())); + if (createUnknown) forceRegister(new UnknownFlag(entry.getKey())); } else { - parent.getRegionGroupFlag().unmarshal(entry.getValue()); + values.put(parent.getRegionGroupFlag(), parent.getRegionGroupFlag().unmarshal(entry.getValue())); } }