Merge from upstream

mcchampions · Dec 24, 2024 · 1932f89 · 1932f89
2 parents 6cc2b49 + 2017d3d
commit 1932f89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java b/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java
@@ -237,6 +237,8 @@ public SlimefunUniversalBlockData createUniversalBlock(Location l, String sfId)
 
         uniData.setIsDataLoaded(true);
 
+        uniData.initLastPresent();
+
         loadedUniversalData.put(uuid, uniData);
 
         UniversalMenuPreset preset = UniversalMenuPreset.getPreset(sfId);

diff --git a/...va/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunUniversalBlockData.java b/...va/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunUniversalBlockData.java
@@ -4,9 +4,6 @@
 import com.xzavier0722.mc.plugin.slimefun4.storage.util.LocationUtils;
 import io.github.bakedlibs.dough.blocks.BlockPosition;
 import java.util.UUID;
-import java.util.logging.Level;
-
-import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
 import org.bukkit.Location;
 
 public class SlimefunUniversalBlockData extends SlimefunUniversalData {
@@ -20,13 +17,16 @@ public SlimefunUniversalBlockData(UUID uuid, String sfId, BlockPosition present)
         super(uuid, sfId);
 
         this.lastPresent = present;
-        setTraitData(UniversalDataTrait.BLOCK, LocationUtils.locationToString(lastPresent.toLocation()));
     }
 
     public SlimefunUniversalBlockData(UUID uuid, String sfId, Location present) {
         this(uuid, sfId, new BlockPosition(present));
     }
 
+    public void initLastPresent() {
+        setTraitData(UniversalDataTrait.BLOCK, LocationUtils.locationToString(lastPresent.toLocation()));
+    }
+
     public void setLastPresent(BlockPosition lastPresent) {
         setTraitData(UniversalDataTrait.BLOCK, LocationUtils.locationToString(lastPresent.toLocation()));
         this.lastPresent = lastPresent;
@@ -37,14 +37,17 @@ public void setLastPresent(Location l) {
     }
 
     public BlockPosition getLastPresent() {
+        String data = getData(UniversalDataTrait.BLOCK.getReservedKey());
+
         if (lastPresent != null) {
+            if (data == null) {
+                setTraitData(UniversalDataTrait.BLOCK, LocationUtils.locationToString(lastPresent.toLocation()));
+            }
+
             return lastPresent;
         }
 
-        String data = getData("location");
-
         if (data == null) {
-            Slimefun.logger().log(Level.WARNING.WARNING, "UniversalBlockData [" + getUUID() + "] missing location data");
             return null;
         }