From d1cb644712a4baba450f541978b5e8effaaac598 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Fri, 10 Sep 2021 19:14:47 +0100
Subject: [PATCH] Fix empty prefix/suffix strings in YAML storage (#3139,
 #3160)

---
 .../file/AbstractConfigurateStorage.java            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
index 7cfe2934f..e812e83ad 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/implementation/file/AbstractConfigurateStorage.java
@@ -439,11 +439,12 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
         }
 
         // assume 'configNode' is the actual entry.
-        String permission = children.get(keyFieldName).getString(null);
-        if (permission == null || permission.isEmpty()) {
+        ConfigurationNode appended = children.get(keyFieldName);
+        if (appended == null) {
             return null;
         }
 
+        String permission = appended.getString("");
         return new NodeEntry(permission, configNode);
     }
 
@@ -458,7 +459,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
             }
 
             NodeEntry entry = parseNode(appended, "permission");
-            if (entry == null) {
+            if (entry == null || entry.key.isEmpty()) {
                 continue;
             }
 
@@ -476,7 +477,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
             }
 
             NodeEntry entry = parseNode(appended, "group");
-            if (entry == null) {
+            if (entry == null || entry.key.isEmpty()) {
                 continue;
             }
 
@@ -512,7 +513,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
 
         for (ConfigurationNode appended : data.getNode("meta").getChildrenList()) {
             NodeEntry entry = parseNode(appended, "key");
-            if (entry == null) {
+            if (entry == null || entry.key.isEmpty()) {
                 continue;
             }
 
@@ -545,7 +546,7 @@ public abstract class AbstractConfigurateStorage implements StorageImplementatio
 
     private void appendNode(ConfigurationNode base, String key, ConfigurationNode attributes, String keyFieldName) {
         ConfigurationNode appended = base.appendListNode();
-        if (this.loader instanceof YamlLoader) {
+        if (this.loader instanceof YamlLoader && !key.isEmpty()) {
             // create a map node with a single entry of key --> attributes
             appended.getNode(key).setValue(attributes);
         } else {