Fix cargo dupe (#38)

Slimefun-Addon-Community · Jul 8, 2023 · 4461f8d · 4461f8d
1 parent 65938f0
commit 4461f8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
 
                 <configuration>
                     <minimizeJar>true</minimizeJar>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>com.github.Slimefun</groupId>
             <artifactId>Slimefun4</artifactId>
-            <version>a86446e236</version>
+            <version>RC-35</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/io/github/thebusybiscuit/mobcapturer/items/MobEgg.java b/src/main/java/io/github/thebusybiscuit/mobcapturer/items/MobEgg.java
@@ -29,6 +29,7 @@
 import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack;
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
+import io.github.thebusybiscuit.slimefun4.core.attributes.DistinctiveItem;
 import io.github.thebusybiscuit.slimefun4.core.attributes.NotPlaceable;
 import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
 import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
@@ -44,7 +45,7 @@
  *
  * @author TheBusyBiscuit
  */
-public class MobEgg<T extends LivingEntity> extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable {
+public class MobEgg<T extends LivingEntity> extends SimpleSlimefunItem<ItemUseHandler> implements NotPlaceable, DistinctiveItem {
 
     private final MobAdapter<T> adapter;
 
@@ -135,4 +136,8 @@ protected boolean canPlaceMob(Player p, Location l) {
         return Slimefun.getProtectionManager().hasPermission(p, l, Interaction.PLACE_BLOCK);
     }
 
+    @Override
+    public boolean canStack(@Nonnull ItemMeta sfItemMeta, @Nonnull ItemMeta itemMeta) {
+        return sfItemMeta.getPersistentDataContainer().equals(itemMeta.getPersistentDataContainer());
+    }
 }