Fix default flags NPE

IntellectualSites · Aug 17, 2016 · 3558105 · 3558105
1 parent f651607
commit 3558105
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java
@@ -346,7 +346,7 @@ public static Map<Flag<?>, Object> parseFlags(List<String> flagStrings) {
             } else {
                 split = key.split(":");
             }
-            Flag<?> flag = getFlag(split[0]);
+            Flag<?> flag = getOrCreateFlag(split[0]);
             Object value = flag.parseValue(split[1]);
             map.put(flag, value);
         }

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java b/Core/src/main/java/com/intellectualcrafters/plot/flag/Flags.java
@@ -149,8 +149,8 @@ public static Collection<Flag<?>> getFlags() {
     }
 
     public static Flag<?> getFlag(String flag) {
-    return flags.get(flag);
-}
+        return flags.get(flag);
+    }
 
     public static void registerFlag(final Flag<?> flag) {
         final Flag<?> duplicate = flags.put(flag.getName(), flag);