Revert "Update"

This reverts commit 25b9f25.
mcchampions · Jul 4, 2024 · c5ffedf · c5ffedf
1 parent 58b0bfc
commit c5ffedf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/SlimefunBlockData.java
@@ -52,10 +52,28 @@ public class SlimefunBlockData extends ASlimefunDataContainer {
         this.sfItemStack = other.sfItemStack;
     }
 
+<<<<<<< Updated upstream
+
+=======
+<<<<<<< Updated upstream
+    @Nonnull
+>>>>>>> Stashed changes
+    public Location getLocation() {
+        return location;
+    }
+
+<<<<<<< Updated upstream
+
+=======
+    @Nonnull
+=======
+
     public String getSfNbt() {
         return NBT.readNbt(sfItemStack).toString();
     }
 
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
     public String getSfId() {
         return sfItemStack.getItemId();
     }

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java b/src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java
@@ -1232,8 +1232,9 @@ public static Optional<SlimefunItem> getOptionalById(String id) {
         }
 
         Optional<String> itemID = Slimefun.getItemDataService().getItemData(item);
-        SlimefunItem sfItem = itemID.map(SlimefunItem::getById).orElse(null);
-        return sfItem;
+
+        return itemID.map(SlimefunItem::getById).orElse(null);
+
     }
 
     /**

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
@@ -3,7 +3,14 @@
 import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback;
 import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunBlockData;
 import com.xzavier0722.mc.plugin.slimefun4.storage.util.StorageCacheUtils;
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+import io.github.bakedlibs.dough.protection.Interaction;
+=======
 import de.tr7zw.nbtapi.NBT;
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.api.events.ExplosiveToolBreakBlocksEvent;
 import io.github.thebusybiscuit.slimefun4.api.events.SlimefunBlockBreakEvent;
@@ -37,13 +44,27 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+<<<<<<< Updated upstream
+=======
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.ArrayList;
+<<<<<<< Updated upstream
+=======
+import java.util.Collection;
+>>>>>>> Stashed changes
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 /**
  * The {@link BlockListener} is responsible for listening to the {@link BlockPlaceEvent}
  * and {@link BlockBreakEvent}.