From a29bcd457ec88334b04cfb8e7710450d80f81454 Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@gmail.com>
Date: Fri, 18 Jan 2019 17:40:55 +0100
Subject: [PATCH] Updated FlagSerializers to use FlagsManager#getFlag(String)

---
 .../database/objects/adapters/FlagSerializer.java      | 10 ++--------
 .../database/objects/adapters/FlagSerializer2.java     |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java
index abbbf49c8..118bd0932 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java
@@ -29,17 +29,11 @@ public class FlagSerializer implements AdapterInterface<Map<Flag, Integer>, Map<
         if (object instanceof MemorySection) {
             MemorySection section = (MemorySection) object;
             for (String key : section.getKeys(false)) {
-                Flag flag = BentoBox.getInstance().getFlagsManager().getFlagByID(key);
-                if (flag != null) {
-                    result.put(flag, section.getInt(key));
-                }
+                BentoBox.getInstance().getFlagsManager().getFlag(key).ifPresent(flag -> result.put(flag, section.getInt(key)));
             }
         } else {
             for (Entry<String, Integer> en : ((Map<String, Integer>)object).entrySet()) {
-                Flag flag = BentoBox.getInstance().getFlagsManager().getFlagByID(en.getKey());
-                if (flag != null) {
-                    result.put(flag, en.getValue());
-                }
+                BentoBox.getInstance().getFlagsManager().getFlag(en.getKey()).ifPresent(flag -> result.put(flag, en.getValue()));
             }
         }
         return result;
diff --git a/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java
index 23c5c3caa..564eec52c 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java
@@ -26,11 +26,11 @@ public class FlagSerializer2 implements AdapterInterface<Map<Flag, Integer>, Map
         if (object instanceof MemorySection) {
             MemorySection section = (MemorySection) object;
             for (String key : section.getKeys(false)) {
-                result.put(BentoBox.getInstance().getFlagsManager().getFlagByID(key), section.getBoolean(key) ? 0 : -1);
+                BentoBox.getInstance().getFlagsManager().getFlag(key).ifPresent(flag -> result.put(flag, section.getBoolean(key) ? 0 : -1));
             }
         } else {
             for (Entry<String, Boolean> en : ((Map<String, Boolean>)object).entrySet()) {
-                result.put(BentoBox.getInstance().getFlagsManager().getFlagByID(en.getKey()), en.getValue() ? 0 : -1);
+                BentoBox.getInstance().getFlagsManager().getFlag(en.getKey()).ifPresent(flag -> result.put(flag, en.getValue() ? 0 : -1));
             }
         }
         return result;