diff --git a/pom.xml b/pom.xml index 3dc255e..267dac6 100644 --- a/pom.xml +++ b/pom.xml @@ -117,8 +117,8 @@ com.songoda - abledskyblock - 79.1 + skyblock + 2.1.2 provided diff --git a/src/main/java/com/songoda/epichoppers/tasks/HopTask.java b/src/main/java/com/songoda/epichoppers/tasks/HopTask.java index 72023f6..e531473 100644 --- a/src/main/java/com/songoda/epichoppers/tasks/HopTask.java +++ b/src/main/java/com/songoda/epichoppers/tasks/HopTask.java @@ -9,6 +9,8 @@ import com.songoda.epichoppers.settings.Settings; import com.songoda.epichoppers.utils.HopperDirection; import com.songoda.epichoppers.utils.Methods; import com.songoda.epichoppers.utils.StorageContainerCache; +import com.songoda.skyblock.utils.version.Materials; + import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -174,8 +176,14 @@ public class HopTask extends BukkitRunnable { } else { com.songoda.skyblock.stackable.StackableManager stackableManager = ((com.songoda.skyblock.SkyBlock) fabledSkyblockPlugin).getStackableManager(); if (stackableManager != null && stackableManager.isStacked(pointingLocation)) { - Material mat = pointingLocation.getBlock().getType(); - com.songoda.skyblock.stackable.Stackable stackable = stackableManager.getStack(pointingLocation, mat); + Block pointingBlock = pointingLocation.getBlock(); + + Material mat = pointingBlock.getType(); + byte data = pointingBlock.getData(); + + Materials materials = Materials.getMaterials(mat, data); + + com.songoda.skyblock.stackable.Stackable stackable = stackableManager.getStack(pointingLocation, materials); for (int i = 0; i < 5; i++) { final ItemStack item = hopperCache.cachedInventory[i]; @@ -183,7 +191,7 @@ public class HopTask extends BukkitRunnable { continue; } - if (item.getType() == mat) { + if (Materials.getMaterials(item.getType(), (byte) item.getDurability()) == materials) { stackable.addOne(); if (item.getAmount() == 1) { hopperCache.removeItem(i);