fix: blockdata key set failure

Author: m1919810

src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/ASlimefunDataContainer.java

@@ -1,7 +1,10 @@
 package com.xzavier0722.mc.plugin.slimefun4.storage.controller;
 
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.ParametersAreNonnullByDefault;
 import lombok.Getter;
-import lombok.Setter;
 
 /**
  * Slimefun 数据容器的抽象类.
@@ -16,10 +19,69 @@ public abstract class ASlimefunDataContainer extends ADataContainer {
     @Getter
     private final String sfId;
 
-    @Setter
     @Getter
     private volatile boolean pendingRemove = false;
 
+    // use weak hash map to capture the pending remove datas, if it is removed finally, it will not cause memory leak
+    private static final WeakHashMap<ASlimefunDataContainer, Map<String, String>> capturedPendingRemoveData =
+            new WeakHashMap<>();
+
+    protected void setWhilePendingRemove(String key, String value) {
+        if (pendingRemove) {
+            Map<String, String> map;
+            synchronized (capturedPendingRemoveData) {
+                map = capturedPendingRemoveData.computeIfAbsent(this, (k) -> new ConcurrentHashMap<>());
+            }
+            map.put(key, value);
+        }
+    }
+
+    public void setPendingRemove(boolean val) {
+        if (val) {
+            pendingRemove = true;
+        } else {
+            // save keys during the remove
+            pendingRemove = false;
+            Map<String, String> map;
+            synchronized (capturedPendingRemoveData) {
+                map = capturedPendingRemoveData.remove(this);
+            }
+            if (map != null) {
+                for (var entry : map.entrySet()) {
+                    setData(entry.getKey(), entry.getValue());
+                }
+            }
+        }
+    }
+
+    @ParametersAreNonnullByDefault
+    public void setData(String key, String val) {
+        checkData();
+        setCacheInternal(key, val, true);
+        if (isPendingRemove()) {
+            // someone is modifying a removed blockData or a virtual blockData, DO NOT SAVE
+            // save the key-value for other later use
+            setWhilePendingRemove(key, val);
+            return;
+        } else {
+            updateDataBaseKey(key);
+        }
+    }
+
+    @ParametersAreNonnullByDefault
+    public void removeData(String key) {
+        if (removeCacheInternal(key) != null || !isDataLoaded()) {
+            if (isPendingRemove()) {
+                setWhilePendingRemove(key, null);
+            } else {
+                updateDataBaseKey(key);
+            }
+        }
+    }
+
+    @ParametersAreNonnullByDefault
+    public abstract void updateDataBaseKey(String key);
+
     public ASlimefunDataContainer(String key, String sfId) {
         super(key);
         this.sfId = sfId;

src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java

@@ -48,26 +48,6 @@ public String getSfId() {
         return super.getSfId();
     }
 
-    @ParametersAreNonnullByDefault
-    public void setData(String key, String val) {
-        checkData();
-
-        if (isPendingRemove()) {
-            // someone is modifying a removed blockData or a virtual blockData, DO NOT SAVE
-            return;
-        }
-
-        setCacheInternal(key, val, true);
-        Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedBlockDataUpdate(this, key);
-    }
-
-    @ParametersAreNonnullByDefault
-    public void removeData(String key) {
-        if (removeCacheInternal(key) != null || !isDataLoaded()) {
-            Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedBlockDataUpdate(this, key);
-        }
-    }
-
     @ParametersAreNullableByDefault
     void setBlockMenu(BlockMenu blockMenu) {
         menu = blockMenu;
@@ -93,4 +73,10 @@ void setBlockMenu(BlockMenu blockMenu) {
 
         return re;
     }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    public void updateDataBaseKey(String key) {
+        Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedBlockDataUpdate(this, key);
+    }
 }

src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunUniversalData.java

@@ -37,17 +37,16 @@ public class SlimefunUniversalData extends ASlimefunDataContainer {
     @ParametersAreNonnullByDefault
     @SneakyThrows
     public void setData(String key, String val) {
-        checkData();
-
-        if (isPendingRemove()) {
-            throw new IllegalStateException("不能修改即将删除的方块数据");
-        }
-
         if (UniversalDataTrait.isReservedKey(key)) {
             throw new IllegalAccessException("不能修改当前受保护的方块数据键值对");
         }
 
-        setCacheInternal(key, val, true);
+        super.setData(key, val);
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    public void updateDataBaseKey(String key) {
         Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedUniversalDataUpdate(this, key);
     }
 
@@ -64,13 +63,6 @@ protected void setTraitData(UniversalDataTrait trait, String val) {
         }
     }
 
-    @ParametersAreNonnullByDefault
-    public void removeData(String key) {
-        if (removeCacheInternal(key) != null || !isDataLoaded()) {
-            Slimefun.getDatabaseManager().getBlockDataController().scheduleDelayedUniversalDataUpdate(this, key);
-        }
-    }
-
     @Nullable public ItemStack[] getMenuContents() {
         if (menu == null) {
             return null;