Fix StackOverflow exception

CitizensDev · Mar 11, 2013 · 18eaf51 · 18eaf51
1 parent 65eafd0
commit 18eaf51
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/util/DataKey.java b/src/main/java/net/citizensnpcs/api/util/DataKey.java
@@ -9,7 +9,7 @@
 
 public abstract class DataKey {
     protected final String path;
-    boolean database = this instanceof DatabaseKey;
+    private final boolean database = this instanceof DatabaseKey;
 
     protected DataKey(String path) {
         this.path = path;
@@ -24,15 +24,21 @@ protected String createRelativeKey(String from) {
         return path.isEmpty() ? from : path + '.' + from;
     }
 
+    private boolean transferring = false;
+
     protected void transferOld(String key) {
-        if (database)
+        if (database || transferring)
             return;
+        transferring = true;
         String repl = key.replace("-", "");
-        if (!keyExists(repl))
+        if (!keyExists(repl)) {
+            transferring = false;
             return;
+        }
         Object value = getRaw(repl);
         removeKey(repl);
         setRaw(key, value);
+        transferring = false;
     }
 
     @Override